summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_android.gypi
diff options
context:
space:
mode:
authorcjhopman <cjhopman@chromium.org>2014-10-13 15:47:54 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-13 22:48:10 +0000
commit11a68cbf1df1110ebac0b649edf2aef22682387e (patch)
tree8972229c5495f4435deff5083b0a61be2e18fb3b /chrome/chrome_android.gypi
parent93bce7ece7f312875a9a2fd20c25c7f769e7a7e6 (diff)
downloadchromium_src-11a68cbf1df1110ebac0b649edf2aef22682387e.zip
chromium_src-11a68cbf1df1110ebac0b649edf2aef22682387e.tar.gz
chromium_src-11a68cbf1df1110ebac0b649edf2aef22682387e.tar.bz2
Make chrome_shell_apk build
This mostly just adds the chrome_shell_apk build definition and those of a whole bunch of targets. Adds a simple check that when DEPRECATED_java_in_dir is used, it actually includes the "src" at the end (GYP just assumes that you really meant that java files are in <(java_in_dir)/src). Makes the call to process_resources only generate R.java for extra packages when being run as part of the apk step (otherwise, for example, both chrome resources and content resources would contain an R.java for net resources and compilation would fail). Depends on https://codereview.chromium.org/581273004/ Adds the following targets -- and enables ~300 more (550 counting template-generated inner targets): //chrome:chrome_android_core //chrome/android:chrome_strings_grd //chrome/android:chrome_java //chrome/android:activity_type_ids_javagen //chrome/android:app_banner_metrics_ids_javagen //chrome/android:resource_id_javagen //chrome/android:profile_account_management_metrics_javagen //chrome/android:profile_sync_service_model_type_selection_javagen //chrome/android:toolbar_model_security_levels_javagen //chrome/android:tab_load_status_javagen //chrome/android:chrome_shell_base //chrome/android:chrome_shell //chrome/android:chrome_sync_shell //chrome/android:chrome_shell_resources //chrome/android:chrome_shell_java //chrome/android:chrome_shell_assets //chrome/android:chrome_shell_apk //chrome/android:chrome_sync_shell_apk //components/bookmarks:bookmarks_java //components/bookmarks:bookmarks_jni_headers //components/bookmarks:bookmark_type_javagen //components/dom_distiller/android:dom_distiller_core_java //components/dom_distiller/android:dom_distiller_core_font_family_javagen //components/dom_distiller/android:dom_distiller_core_theme_javagen //components/enhanced_bookmarks:jni_headers //components/enhanced_bookmarks/android:enhanced_bookmarks_java //components/gcm_driver:gcm_driver_java //components/gcm_driver:jni_headers //components/navigation_interception/android:navigation_interception_java //components/variations:variations_java //components/web_contents_delegate_android:web_contents_delegate_android //components/web_contents_delegate_android:web_contents_delegate_android_java //components/web_contents_delegate_android:web_contents_delegate_android_jni_headers //printing:printing_java //sync:fake_server_jni //sync:sync_java_test_support //sync:test_support_sync_fake_server_android //sync:sync_unit_tests_apk //sync/android:sync_java //sync/android:sync_javatests BUG=359249 TBR=ben Review URL: https://codereview.chromium.org/570203002 Cr-Commit-Position: refs/heads/master@{#299381}
Diffstat (limited to 'chrome/chrome_android.gypi')
-rw-r--r--chrome/chrome_android.gypi2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi
index f494b39..125ae1a 100644
--- a/chrome/chrome_android.gypi
+++ b/chrome/chrome_android.gypi
@@ -18,6 +18,7 @@
],
'targets': [
{
+ # GN: //chrome:chrome_android_core
'target_name': 'chrome_android_core',
'type': 'static_library',
'dependencies': [
@@ -52,6 +53,7 @@
},
},
{
+ # GYP: //chrome/android:chrome_version_java
'target_name': 'chrome_version_java',
'type': 'none',
'variables': {