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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/android/chrome_apk.gyp

Issue 2304303002: Inline GYP sources for chrome/ android and chromeos. (Closed)
Patch Set: merge Created 4 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 | « chrome/android/BUILD.gn ('k') | chrome/android/chrome_apk.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/chrome_apk.gyp
diff --git a/chrome/android/chrome_apk.gyp b/chrome/android/chrome_apk.gyp
deleted file mode 100644
index 15be33a23507a65339b797ba7f44fbf1b9e54371..0000000000000000000000000000000000000000
--- a/chrome/android/chrome_apk.gyp
+++ /dev/null
@@ -1,423 +0,0 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-{
- 'includes': [
- '../../chrome/chrome_android_paks.gypi', # Included for the list of pak resources.
- '../../build/util/version.gypi'
- ],
- 'variables': {
- 'chromium_code': 1,
- 'package_name': 'chrome_public_apk',
- 'manifest_package': 'org.chromium.chrome',
- 'sync_shell_manifest_package': 'org.chromium.chrome.sync_shell',
- 'chrome_public_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_public_apk_manifest/AndroidManifest.xml',
- 'chrome_public_test_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_public_test_apk_manifest/AndroidManifest.xml',
- 'chrome_sync_shell_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_sync_shell_apk_manifest/AndroidManifest.xml',
- 'chrome_sync_shell_test_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_sync_shell_test_apk_manifest/AndroidManifest.xml',
- # This list is shared with GN.
- # Defines a list of source files should be present in the Chrome app.
- 'chrome_app_native_sources': [
- '../app/android/chrome_main_delegate_android_initializer.cc',
- '../browser/android/chrome_entry_point.cc',
- ],
- # This list is only used by GN but kept here to mirror
- # chrome_app_native_sources.
- # Defines a list of source files should be present in the Chrome app when
- # distributed as monochrome.
- 'monochrome_app_native_sources': [
- '../app/android/chrome_main_delegate_android_initializer.cc',
- '../browser/android/monochrome_entry_point.cc',
- ],
-
- # This list is shared with GN.
- 'chrome_sync_shell_app_native_sources': [
- '../browser/android/chrome_entry_point.cc',
- '../browser/android/chrome_sync_shell_main_delegate_initializer.cc',
- '../browser/android/chrome_sync_shell_main_delegate.h',
- '../browser/android/chrome_sync_shell_main_delegate.cc',
- ]
- },
- 'targets': [
- {
- # GN: //chrome/android::custom_tabs_service_aidl
- 'target_name': 'custom_tabs_service_aidl',
- 'type': 'none',
- 'variables': {
- 'aidl_interface_file': 'java/src/android/support/customtabs/common.aidl',
- 'aidl_import_include': 'java/src/android/support/customtabs',
- },
- 'sources': [
- 'java/src/android/support/customtabs/ICustomTabsCallback.aidl',
- 'java/src/android/support/customtabs/ICustomTabsService.aidl',
- ],
- 'includes': [ '../../build/java_aidl.gypi' ],
- },
- {
- # GN: //chrome/android:chrome_public_apk_template_resources
- 'target_name': 'chrome_public_apk_template_resources',
- 'type': 'none',
- 'variables': {
- 'jinja_inputs_base_dir': 'java/res_template',
- 'jinja_inputs': [
- '<(jinja_inputs_base_dir)/xml/searchable.xml',
- '<(jinja_inputs_base_dir)/xml/syncadapter.xml',
- ],
- 'jinja_outputs_zip': '<(PRODUCT_DIR)/res.java/<(_target_name).zip',
- 'jinja_variables': [
- 'manifest_package=<(manifest_package)',
- ],
- },
- 'all_dependent_settings': {
- 'variables': {
- 'additional_input_paths': ['<(jinja_outputs_zip)'],
- 'dependencies_res_zip_paths': ['<(jinja_outputs_zip)'],
- },
- },
- 'includes': [ '../../build/android/jinja_template.gypi' ],
- },
- {
- # GN: //chrome/android:chrome_sync_shell_apk_template_resources
- 'target_name': 'chrome_sync_shell_apk_template_resources',
- 'type': 'none',
- 'variables': {
- 'jinja_inputs_base_dir': 'java/res_template',
- 'jinja_inputs': [
- '<(jinja_inputs_base_dir)/xml/searchable.xml',
- '<(jinja_inputs_base_dir)/xml/syncadapter.xml',
- ],
- 'jinja_outputs_zip': '<(PRODUCT_DIR)/res.java/<(_target_name).zip',
- 'jinja_variables': [
- 'manifest_package=<(sync_shell_manifest_package)',
- ],
- },
- 'all_dependent_settings': {
- 'variables': {
- 'additional_input_paths': ['<(jinja_outputs_zip)'],
- 'dependencies_res_zip_paths': ['<(jinja_outputs_zip)'],
- },
- },
- 'includes': [ '../../build/android/jinja_template.gypi' ],
- },
- {
- # The base library used in both ChromePublic and ChromeSyncShell.
- 'target_name': 'libchrome_base',
- 'type': 'none',
- 'dependencies': [
- '../../chrome/chrome.gyp:chrome_android_core',
- ],
- 'include_dirs': [
- '../..',
- ],
- 'conditions': [
- # conditions for order_text_section
- # Cygprofile methods need to be linked into the instrumented build.
- ['order_profiling!=0', {
- 'conditions': [
- ['OS=="android"', {
- 'dependencies': [ '../../tools/cygprofile/cygprofile.gyp:cygprofile' ],
- }],
- ],
- }], # order_profiling!=0
- ],
- },
- {
- # GN: //chrome/android:chrome_public
- 'target_name': 'libchrome',
- 'type': 'shared_library',
- 'sources': [
- '<@(chrome_app_native_sources)',
- ],
- 'dependencies': [
- 'libchrome_base',
- ],
- },
- {
- # GN: //chrome/android:chrome_sync_shell
- 'target_name': 'libchrome_sync_shell',
- 'type': 'shared_library',
- 'sources': [
- '<@(chrome_sync_shell_app_native_sources)',
- ],
- 'dependencies': [
- 'libchrome_base',
- '../../components/sync.gyp:sync',
- '../../components/sync.gyp:test_support_sync_fake_server_android',
- ],
- },
- {
- # GN: //chrome/android:chrome_public_apk_manifest
- 'target_name': 'chrome_public_manifest',
- 'type': 'none',
- 'variables': {
- 'jinja_inputs': ['java/AndroidManifest.xml'],
- 'jinja_output': '<(chrome_public_apk_manifest)',
- 'jinja_variables': [
- 'channel=<(android_channel)',
- 'manifest_package=<(manifest_package)',
- 'min_sdk_version=16',
- 'target_sdk_version=23',
- ],
- },
- 'includes': [ '../../build/android/jinja_template.gypi' ],
- },
- {
- # GN: //chrome/android:chrome_sync_shell_apk_manifest
- 'target_name': 'chrome_sync_shell_apk_manifest',
- 'type': 'none',
- 'variables': {
- 'jinja_inputs': ['java/AndroidManifest.xml'],
- 'jinja_output': '<(chrome_sync_shell_apk_manifest)',
- 'jinja_variables': [
- 'channel=<(android_channel)',
- 'manifest_package=<(sync_shell_manifest_package)',
- 'min_sdk_version=16',
- 'target_sdk_version=22',
- ],
- },
- 'includes': [ '../../build/android/jinja_template.gypi' ],
- },
- {
- # GN: //chrome/android:chrome_public_apk
- 'target_name': 'chrome_public_apk',
- 'type': 'none',
- 'variables': {
- 'android_manifest_path': '<(chrome_public_apk_manifest)',
- 'apk_name': 'ChromePublic',
- 'native_lib_target': 'libchrome',
- 'java_in_dir': 'java',
- 'resource_dir': '../../chrome/android/java/res_chromium',
- 'enable_multidex': 1,
- 'enable_multidex_configurations': ['Debug'],
- 'conditions': [
- # Only attempt loading the library from the APK for 64 bit devices
- # until the number of 32 bit devices which don't support this
- # approach falls to a minimal level - http://crbug.com/390618.
- ['chrome_apk_use_chromium_linker==1 and profiling==0 and (target_arch == "arm64" or target_arch == "x86_64")', {
- 'load_library_from_zip': '<(chrome_apk_load_library_from_zip)',
- }],
- ],
- },
- 'dependencies': [
- 'chrome_android_paks_copy',
- 'chrome_public_apk_template_resources',
- 'libchrome',
- '../chrome.gyp:chrome_java',
- ],
- 'includes': [ 'chrome_apk.gypi' ],
- },
- {
- # GN: N/A
- # chrome_public_apk creates a .jar as a side effect. Any java targets
- # that need that .jar in their classpath should depend on this target,
- 'target_name': 'chrome_public_apk_java',
- 'type': 'none',
- 'dependencies': [
- 'chrome_public_apk',
- ],
- 'includes': [ '../../build/apk_fake_jar.gypi' ],
- },
- {
- # GN: //chrome/android:chrome_sync_shell_apk
- 'target_name': 'chrome_sync_shell_apk',
- 'type': 'none',
- 'variables': {
- 'android_manifest_path': '<(chrome_sync_shell_apk_manifest)',
- 'apk_name': 'ChromeSyncShell',
- 'native_lib_target': 'libchrome_sync_shell',
- 'java_in_dir': 'java',
- 'enable_multidex': 1,
- 'enable_multidex_configurations': ['Debug'],
- 'conditions': [
- # Only attempt loading the library from the APK for 64 bit devices
- # until the number of 32 bit devices which don't support this
- # approach falls to a minimal level - http://crbug.com/390618.
- ['chrome_apk_use_chromium_linker==1 and profiling==0 and (target_arch == "arm64" or target_arch == "x86_64")', {
- 'load_library_from_zip': '<(chrome_apk_load_library_from_zip)',
- }],
- ],
- },
- 'dependencies': [
- 'chrome_android_paks_copy',
- 'chrome_sync_shell_apk_template_resources',
- 'libchrome_sync_shell',
- '../chrome.gyp:chrome_java',
- # This exists here because com.google.protobuf.nano is needed in tests,
- # but that code is stripped out via proguard. Adding this deps adds
- # usages and prevents removal of the proto code.
- '../../components/sync.gyp:test_support_sync_proto_java',
- ],
- 'includes': [ 'chrome_apk.gypi' ],
- },
- {
- # GN: N/A
- # chrome_sync_shell_apk creates a .jar as a side effect. Any java targets
- # that need that .jar in their classpath should depend on this target.
- 'target_name': 'chrome_sync_shell_apk_java',
- 'type': 'none',
- 'dependencies': [
- 'chrome_sync_shell_apk',
- ],
- 'includes': [ '../../build/apk_fake_jar.gypi' ],
- },
- {
- # GN: //chrome/android:chrome_test_java
- 'target_name': 'chrome_test_java',
- 'type': 'none',
- 'variables': {
- 'java_in_dir': 'javatests',
- },
- 'dependencies': [
- '../../base/base.gyp:base_java',
- '../../base/base.gyp:base_java_test_support',
- '../../chrome/chrome.gyp:chrome_java',
- '../../chrome/chrome.gyp:chrome_java_test_support',
- '../../components/components.gyp:invalidation_javatests',
- '../../components/components.gyp:gcm_driver_java',
- '../../components/components.gyp:offline_page_model_enums_java',
- '../../components/components.gyp:precache_javatests',
- '../../components/components.gyp:security_state_enums_java',
- '../../components/components.gyp:web_contents_delegate_android_java',
- '../../content/content_shell_and_tests.gyp:content_java_test_support',
- '../../mojo/mojo_public.gyp:mojo_bindings_java',
- '../../mojo/mojo_public.gyp:mojo_public_java',
- '../../net/net.gyp:net_java',
- '../../net/net.gyp:net_java_test_support',
- '../../components/sync.gyp:sync_java_test_support',
- '../../third_party/android_tools/android_tools.gyp:android_support_v7_appcompat_javalib',
- '../../third_party/android_tools/android_tools.gyp:google_play_services_javalib',
- '../../third_party/WebKit/public/blink.gyp:android_mojo_bindings_java',
- '../../ui/android/ui_android.gyp:ui_javatests',
- ],
- 'includes': [ '../../build/java.gypi' ],
- },
- {
- # GN: //chrome/android:chrome_public_test_apk_manifest
- 'target_name': 'chrome_public_test_apk_manifest',
- 'type': 'none',
- 'variables': {
- 'jinja_inputs': ['javatests/AndroidManifest.xml'],
- 'jinja_output': '<(chrome_public_test_apk_manifest)',
- 'jinja_variables': [
- 'manifest_package=<(manifest_package)',
- ],
- },
- 'includes': [ '../../build/android/jinja_template.gypi' ],
- },
- {
- # GN: //chrome/android:chrome_sync_shell_test_apk_manifest
- 'target_name': 'chrome_sync_shell_test_apk_manifest',
- 'type': 'none',
- 'variables': {
- 'jinja_inputs': ['sync_shell/javatests/AndroidManifest.xml'],
- 'jinja_output': '<(chrome_sync_shell_test_apk_manifest)',
- 'jinja_variables': [
- 'manifest_package=<(sync_shell_manifest_package)',
- ],
- },
- 'includes': [ '../../build/android/jinja_template.gypi' ],
- },
- {
- # GN: //chrome/android:chrome_public_test_apk
- 'target_name': 'chrome_public_test_apk',
- 'type': 'none',
- 'dependencies': [
- 'chrome_test_java',
- 'chrome_public_apk_java',
- '../../chrome/chrome.gyp:require_chrome_public_test_support_apk',
- '../../net/net.gyp:require_net_test_support_apk',
- '../../testing/android/on_device_instrumentation.gyp:broker_java',
- '../../testing/android/on_device_instrumentation.gyp:require_driver_apk',
- ],
- 'variables': {
- 'android_manifest_path': '<(chrome_public_test_apk_manifest)',
- 'package_name': 'chrome_public_test',
- 'java_in_dir': 'javatests',
- 'java_in_dir_suffix': '/src_dummy',
- 'apk_name': 'ChromePublicTest',
- 'is_test_apk': 1,
- 'never_lint': 1,
- 'test_type': 'instrumentation',
- 'isolate_file': '../chrome_public_test_apk.isolate',
- 'additional_apks': [
- '<(PRODUCT_DIR)/apks/ChromePublicTestSupport.apk',
- '<(PRODUCT_DIR)/apks/ChromiumNetTestSupport.apk',
- ],
- },
- 'includes': [
- '../../build/java_apk.gypi',
- '../../build/android/test_runner.gypi',
- ],
- },
- {
- # GN: //chrome/android:chrome_sync_shell_test_apk
- 'target_name': 'chrome_sync_shell_test_apk',
- 'type': 'none',
- 'dependencies': [
- 'chrome_sync_shell_apk_java',
- '../../base/base.gyp:base_java',
- '../../base/base.gyp:base_java_test_support',
- '../../chrome/chrome.gyp:chrome_java',
- '../../chrome/chrome.gyp:chrome_java_test_support',
- '../../components/sync.gyp:sync_java',
- '../../components/sync.gyp:sync_java_test_support',
- '../../components/sync.gyp:sync_javatests',
- '../../components/sync.gyp:test_support_sync_proto_java',
- '../../testing/android/on_device_instrumentation.gyp:broker_java',
- '../../testing/android/on_device_instrumentation.gyp:require_driver_apk',
- ],
- 'variables': {
- 'android_manifest_path': '<(chrome_sync_shell_test_apk_manifest)',
- 'package_name': 'chrome_sync_shell_test',
- 'java_in_dir': 'sync_shell/javatests',
- 'apk_name': 'ChromeSyncShellTest',
- 'is_test_apk': 1,
- 'test_type': 'instrumentation',
- },
- 'includes': [
- '../../build/java_apk.gypi',
- '../../build/android/test_runner.gypi',
- ],
- },
- ],
- 'conditions': [
- ['test_isolation_mode != "noop"',
- {
- 'targets': [
- {
- 'target_name': 'chrome_public_test_apk_run',
- 'type': 'none',
- 'dependencies': [
- 'chrome_public_test_apk',
- ],
- 'includes': [
- '../../build/isolate.gypi',
- ],
- 'sources': [
- 'chrome_public_test_apk.isolate',
- ],
- },
- {
- 'target_name': 'chrome_sync_shell_test_apk_run',
- 'type': 'none',
- 'dependencies': [
- 'chrome_sync_shell_test_apk',
- ],
- 'includes': [
- '../../build/isolate.gypi',
- ],
- 'sources': [
- 'chrome_sync_shell_test_apk.isolate',
- ],
- },
- ]
- }
- ],
- ],
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/android/chrome_apk.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698