diff options
| author | shashishekhar@chromium.org <shashishekhar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 17:21:09 +0000 |
|---|---|---|
| committer | shashishekhar@chromium.org <shashishekhar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 17:21:09 +0000 |
| commit | 413e32da4f13000441f390b8aa721ede3d9c181a (patch) | |
| tree | 52594108e53e102107e263141e4275556a2730c3 /build | |
| parent | eb040998b02d1514cb008cd141925581ad9d2433 (diff) | |
| download | chromium_src-413e32da4f13000441f390b8aa721ede3d9c181a.zip chromium_src-413e32da4f13000441f390b8aa721ede3d9c181a.tar.gz chromium_src-413e32da4f13000441f390b8aa721ede3d9c181a.tar.bz2 | |
Nuke unused test code.
SDK build is the default build, we do not need Android.mk based
compilation.
Review URL: https://chromiumcodereview.appspot.com/11066094
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161127 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all_android.gyp | 14 | ||||
| -rw-r--r-- | build/apk_test.gypi | 1 |
2 files changed, 2 insertions, 13 deletions
diff --git a/build/all_android.gyp b/build/all_android.gyp index 77b9d52..3f1c539 100644 --- a/build/all_android.gyp +++ b/build/all_android.gyp @@ -20,15 +20,9 @@ '../content/content.gyp:content_shell_apk', '<@(android_app_targets)', 'android_builder_tests', + '../android_webview/android_webview.gyp:android_webview_apk', + '../chrome/chrome.gyp:chromium_testshell', ], - 'conditions': [ - ['sdk_build==1', { - 'dependencies': [ - '../android_webview/android_webview.gyp:android_webview_apk', - '../chrome/chrome.gyp:chromium_testshell', - ], - }], # sdk_build==1 - ], # conditions }, # target_name: All { # The current list of tests for android. This is temporary @@ -92,10 +86,6 @@ '../sql/sql.gyp:sql_unittests_apk', '../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', '../chrome/chrome.gyp:chromium_testshell_test_apk', ], diff --git a/build/apk_test.gypi b/build/apk_test.gypi index 4f6d5c8..eefcbd7 100644 --- a/build/apk_test.gypi +++ b/build/apk_test.gypi @@ -52,7 +52,6 @@ '--strip-binary=<(android_strip)', '--app_abi', '<(android_app_abi)', - '--sdk-build=<(sdk_build)', '--ant-args', '-DPRODUCT_DIR=<(ant_build_out)', '--ant-args', |