Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: build/all_android.gyp

Issue 10947033: [Android] Make android_webview targets sdk-only. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix ordering issue Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all_android.gyp
diff --git a/build/all_android.gyp b/build/all_android.gyp
index 3d215ab946a8c1b11ee4877f83ed3b7c1ef172b8..26df56328fdcddb0c293b018daa2928a5f324bef 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',
+ ],
+ }],
],
},
{
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698