From 11a68cbf1df1110ebac0b649edf2aef22682387e Mon Sep 17 00:00:00 2001 From: cjhopman Date: Mon, 13 Oct 2014 15:47:54 -0700 Subject: 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} --- components/dom_distiller.gypi | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'components/dom_distiller.gypi') diff --git a/components/dom_distiller.gypi b/components/dom_distiller.gypi index 3cab978..b720fab5 100644 --- a/components/dom_distiller.gypi +++ b/components/dom_distiller.gypi @@ -175,6 +175,7 @@ ['OS=="android"', { 'targets': [ { + # GN: //components/dom_distiller/android:dom_distiller_core_java 'target_name': 'dom_distiller_core_java', 'type': 'none', 'dependencies': [ @@ -188,6 +189,7 @@ 'includes': [ '../build/java.gypi' ], }, { + # GN: //components/dom_distiller/android:dom_distiller_core_font_family_javagen 'target_name': 'dom_distiller_core_font_family_java', 'type': 'none', 'sources': [ @@ -200,6 +202,7 @@ 'includes': [ '../build/android/java_cpp_template.gypi' ], }, { + # GN: //components/dom_distiller/core:jni_headers 'target_name': 'dom_distiller_core_jni_headers', 'type': 'none', 'sources': [ @@ -213,6 +216,7 @@ 'includes': [ '../build/jni_generator.gypi' ], }, { + # GN: //components/dom_distiller/android:dom_distiller_core_theme_javagen 'target_name': 'dom_distiller_core_theme_java', 'type': 'none', 'sources': [ -- cgit v1.1