From 84b92fa8262514ba3097a55b550147837a08e906 Mon Sep 17 00:00:00 2001 From: "miu@chromium.org" Date: Wed, 23 Apr 2014 18:30:29 +0000 Subject: Reland: [Cast] Consolidate plethora of GYP files into cast.gyp and cast_testing.gypi. Reland of r265481 (https://codereview.chromium.org/245893005/) with the following fixes: 1. Re-introduce 'include_tests%' conditional. 2. Conditionally include all Cast utility app targets based on a new GYP variable: include_cast_utility_apps 3. Fixed compile errors exposed by landing r265481 on the tree. Testing: 1. This change was tested by building on Linux: `build/gyp_chromium && ninja -C out/Debug All` 2. Confirmed absence of 'include_cast_utility_apps=1' in chromium.gyp_env will disable the Cast utility targets. 3. Ran utility apps to confirm the fixes. R=hclam@chromium.org Review URL: https://codereview.chromium.org/248083005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265690 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/chrome_common.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chrome/chrome_common.gypi') diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 68052a5..4d95f87 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -45,7 +45,7 @@ '<(DEPTH)/content/content.gyp:content_common', '<(DEPTH)/crypto/crypto.gyp:crypto', '<(DEPTH)/extensions/extensions_strings.gyp:extensions_strings', - '<(DEPTH)/media/cast/transport/cast_transport.gyp:cast_transport', + '<(DEPTH)/media/cast/cast.gyp:cast_transport', '<(DEPTH)/net/net.gyp:net', '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/third_party/icu/icu.gyp:icui18n', -- cgit v1.1