diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 21:53:50 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 21:53:50 +0000 |
| commit | aefe6f2daa9c7a9089ebd631a8d1b7223a6ede6c (patch) | |
| tree | 3b76196325bfb1d8280bd1e44847339e3b9b3d0c /build/all_android.gyp | |
| parent | 24607155f458ad850e76d4cebc72d330ee3f42f1 (diff) | |
| download | chromium_src-aefe6f2daa9c7a9089ebd631a8d1b7223a6ede6c.zip chromium_src-aefe6f2daa9c7a9089ebd631a8d1b7223a6ede6c.tar.gz chromium_src-aefe6f2daa9c7a9089ebd631a8d1b7223a6ede6c.tar.bz2 | |
Android: build webview on default bots.
Move the webview targets from the android_experimental target into All
so they are built by default on the main tree and on trybots. The tests
are not run currently; this is just checking that they compile.
The libwebview target is a dependency of android_webview_apk so it
doesn't need to be specified explicitly here.
BUG=
Review URL: https://chromiumcodereview.appspot.com/10918124
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155498 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all_android.gyp')
| -rw-r--r-- | build/all_android.gyp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/build/all_android.gyp b/build/all_android.gyp index 2894287..84345dc 100644 --- a/build/all_android.gyp +++ b/build/all_android.gyp @@ -17,6 +17,7 @@ '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', @@ -34,6 +35,7 @@ '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', @@ -95,9 +97,6 @@ 'target_name': 'android_experimental', 'type': 'none', 'dependencies': [ - '../android_webview/android_webview.gyp:libwebview', - '../android_webview/android_webview.gyp:android_webview_apk', - '../android_webview/android_webview.gyp:android_webview_test_apk', ], }, { |