From 915117b514ef56be52e8b3b2c288d7e7eb5993d3 Mon Sep 17 00:00:00 2001 From: "mkosiba@chromium.org" Date: Thu, 20 Sep 2012 09:18:02 +0000 Subject: [PATCH] [Android] Make android_webview targets sdk-only. These targets are currently only configured to work as part of the SDK build. BUG= Review URL: https://codereview.chromium.org/10947033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157732 0039d316-1c4b-4281-b951-d872f2087c98 --- build/all_android.gyp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/build/all_android.gyp b/build/all_android.gyp index 3d215ab946a8..26df56328fdc 100644 --- a/build/all_android.gyp +++ b/build/all_android.gyp @@ -17,7 +17,6 @@ 'target_name': 'All', 'type': 'none', 'dependencies': [ - '../android_webview/android_webview.gyp:android_webview_apk', '../content/content.gyp:content_shell_apk', '<@(android_app_targets)', 'android_builder_tests', @@ -25,6 +24,7 @@ 'conditions': [ ['sdk_build==1', { 'dependencies': [ + '../android_webview/android_webview.gyp:android_webview_apk', '../chrome/chrome.gyp:chromium_testshell', ], }], # sdk_build==1 @@ -42,7 +42,6 @@ 'target_name': 'android_builder_tests', 'type': 'none', 'dependencies': [ - '../android_webview/android_webview.gyp:android_webview_test_apk', '../base/android/jni_generator/jni_generator.gyp:jni_generator_tests', '../base/base.gyp:base_unittests', '../chrome/chrome.gyp:unit_tests', @@ -94,7 +93,12 @@ '../sync/sync.gyp:sync_unit_tests_apk', '../ui/ui.gyp:ui_unittests_apk', ], - }] + }], + ['sdk_build==1', { + 'dependencies': [ + '../android_webview/android_webview.gyp:android_webview_test_apk', + ], + }], ], }, { -- 2.11.4.GIT