Upstream oodles of Chrome for Android code into Chromium.

chrome/android/chrome_apk.gyp

Index: chrome/android/chrome_apk.gyp
diff --git a/chrome/android/chrome_apk.gyp b/chrome/android/chrome_apk.gyp
new file mode 100644
index 0000000000000000000000000000000000000000..a0a0d75ef7a2e3d4ab1280fba932ed4bae19d903
--- /dev/null
+++ b/chrome/android/chrome_apk.gyp
@@ -0,0 +1,456 @@
+# 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',
+    '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',
+    'never_lint': 1,
+    'chrome_java_dir': 'java_staging',
+    'chrome_java_tests_dir': 'javatests',
+    'chrome_java_test_support_dir': '../test/android/javatests_staging',
+    'chrome_native_sources_dir': '../browser/android/',
+    # This list is shared with GN.
+    'chrome_staging_jni_files': [
+      '<(chrome_java_dir)/src/org/chromium/chrome/browser/bookmark/EditBookmarkHelper.java',
+      '<(chrome_java_dir)/src/org/chromium/chrome/browser/compositor/CompositorView.java',
+      '<(chrome_java_dir)/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java',
+      '<(chrome_java_dir)/src/org/chromium/chrome/browser/compositor/scene_layer/ReaderModeSceneLayer.java',
+      '<(chrome_java_dir)/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java',
+      '<(chrome_java_dir)/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java',
+      '<(chrome_java_dir)/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java',
+      '<(chrome_java_dir)/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java',
+      '<(chrome_java_dir)/src/org/chromium/chrome/browser/document/DocumentWebContentsDelegate.java',
+      '<(chrome_java_dir)/src/org/chromium/chrome/browser/historyreport/HistoryReportJniBridge.java',
+      '<(chrome_java_dir)/src/org/chromium/chrome/browser/policy/PolicyManager.java',
+      '<(chrome_java_dir)/src/org/chromium/chrome/browser/rlz/RevenueStats.java',
+      '<(chrome_java_dir)/src/org/chromium/chrome/browser/tab/BackgroundContentViewHelper.java',
+      '<(chrome_java_dir)/src/org/chromium/chrome/browser/tab/ThumbnailTabHelper.java',
+    ],
+    # This list is shared with GN.
+    'chrome_staging_native_sources': [
+      '<(chrome_native_sources_dir)/bookmark/edit_bookmark_helper.cc',
+      '<(chrome_native_sources_dir)/bookmark/edit_bookmark_helper.h',
+      '<(chrome_native_sources_dir)/chrome_main_delegate_staging_android.cc',
+      '<(chrome_native_sources_dir)/chrome_main_delegate_staging_android.h',
+      '<(chrome_native_sources_dir)/compositor/compositor_view.cc',
+      '<(chrome_native_sources_dir)/compositor/compositor_view.h',
+      '<(chrome_native_sources_dir)/compositor/layer/reader_mode_layer.cc',
+      '<(chrome_native_sources_dir)/compositor/layer/reader_mode_layer.h',
+      '<(chrome_native_sources_dir)/compositor/layer/tab_handle_layer.cc',
+      '<(chrome_native_sources_dir)/compositor/layer/tab_handle_layer.h',
+      '<(chrome_native_sources_dir)/compositor/scene_layer/contextual_search_scene_layer.cc',
+      '<(chrome_native_sources_dir)/compositor/scene_layer/contextual_search_scene_layer.h',
+      '<(chrome_native_sources_dir)/compositor/scene_layer/reader_mode_scene_layer.cc',
+      '<(chrome_native_sources_dir)/compositor/scene_layer/reader_mode_scene_layer.h',
+      '<(chrome_native_sources_dir)/compositor/scene_layer/tab_list_scene_layer.cc',
+      '<(chrome_native_sources_dir)/compositor/scene_layer/tab_list_scene_layer.h',
+      '<(chrome_native_sources_dir)/compositor/scene_layer/tab_strip_scene_layer.cc',
+      '<(chrome_native_sources_dir)/compositor/scene_layer/tab_strip_scene_layer.h',
+      '<(chrome_native_sources_dir)/contextualsearch/contextual_search_context.cc',
+      '<(chrome_native_sources_dir)/contextualsearch/contextual_search_context.h',
+      '<(chrome_native_sources_dir)/contextualsearch/contextual_search_delegate.cc',
+      '<(chrome_native_sources_dir)/contextualsearch/contextual_search_delegate.h',
+      '<(chrome_native_sources_dir)/contextualsearch/contextual_search_manager.cc',
+      '<(chrome_native_sources_dir)/contextualsearch/contextual_search_manager.h',
+      '<(chrome_native_sources_dir)/contextualsearch/contextual_search_tab_helper.cc',
+      '<(chrome_native_sources_dir)/contextualsearch/contextual_search_tab_helper.h',
+      '<(chrome_native_sources_dir)/document/document_web_contents_delegate.cc',
+      '<(chrome_native_sources_dir)/history_report/data_observer.cc',
+      '<(chrome_native_sources_dir)/history_report/data_observer.h',
+      '<(chrome_native_sources_dir)/history_report/data_provider.cc',
+      '<(chrome_native_sources_dir)/history_report/data_provider.h',
+      '<(chrome_native_sources_dir)/history_report/delta_file_backend_leveldb.cc',
+      '<(chrome_native_sources_dir)/history_report/delta_file_backend_leveldb.h',
+      '<(chrome_native_sources_dir)/history_report/delta_file_commons.cc',
+      '<(chrome_native_sources_dir)/history_report/delta_file_commons.h',
+      '<(chrome_native_sources_dir)/history_report/delta_file_service.cc',
+      '<(chrome_native_sources_dir)/history_report/delta_file_service.h',
+      '<(chrome_native_sources_dir)/history_report/get_all_urls_from_history_task.cc',
+      '<(chrome_native_sources_dir)/history_report/get_all_urls_from_hisotry_task.h',
+      '<(chrome_native_sources_dir)/history_report/historic_visits_migration_task.cc',
+      '<(chrome_native_sources_dir)/history_report/historic_visits_migration_task.h',
+      '<(chrome_native_sources_dir)/history_report/history_report_jni_bridge.cc',
+      '<(chrome_native_sources_dir)/history_report/history_report_jni_bridge.h',
+      '<(chrome_native_sources_dir)/history_report/usage_report_util.cc',
+      '<(chrome_native_sources_dir)/history_report/usage_report_util.h',
+      '<(chrome_native_sources_dir)/history_report/usage_reports_buffer_backend.cc',
+      '<(chrome_native_sources_dir)/history_report/usage_reports_buffer_backend.h',
+      '<(chrome_native_sources_dir)/history_report/usage_reports_buffer_service.cc',
+      '<(chrome_native_sources_dir)/history_report/usage_reports_buffer_service.h',
+      '<(chrome_native_sources_dir)/policy/policy_manager.cc',
+      '<(chrome_native_sources_dir)/policy/policy_manager.h',
+      '<(chrome_native_sources_dir)/proto/client_discourse_context.proto',
+      '<(chrome_native_sources_dir)/proto/delta_file.proto',
+      '<(chrome_native_sources_dir)/rlz/revenue_stats.cc',
+      '<(chrome_native_sources_dir)/rlz/revenue_stats.h',
+      '<(chrome_native_sources_dir)/staging_jni_registrar.cc',
+      '<(chrome_native_sources_dir)/staging_jni_registrar.h',
+      '<(chrome_native_sources_dir)/tab/background_content_view_helper.cc',
+      '<(chrome_native_sources_dir)/tab/background_content_view_helper.h',
+      '<(chrome_native_sources_dir)/tab/thumbnail_tab_helper_android.cc',
+      '<(chrome_native_sources_dir)/tab/thumbnail_tab_helper_android.h',
+    ],
+    # This list is shared with GN.
+    # Defines a list of source files should be present in the open-source
+    # chrome-apk but not in the published static_library which is included in the
+    # real chrome for android.
+    'chrome_public_app_native_sources': [
+      '<(chrome_native_sources_dir)/chrome_entry_point.cc',
+      '<(chrome_native_sources_dir)/chrome_main_delegate_staging_android_initializer.cc',
+      '<(chrome_native_sources_dir)/chrome_staging_jni_onload.cc',
+      '<(chrome_native_sources_dir)/chrome_staging_jni_onload.h',
+    ],
+  },
+  'targets': [
+    {
+      # GN: //chrome/browser/android:chrome_staging
+      'target_name': 'libchrome_staging',
+      'type': 'static_library',
+      'dependencies': [
+        'staging_jni_headers',
+        '<(DEPTH)/chrome/chrome.gyp:browser',
+        '<(DEPTH)/components/components.gyp:component_metrics_proto',
+        '<(DEPTH)/skia/skia.gyp:skia',
+        '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+      ],
+      'sources': [
+        '<@(chrome_staging_native_sources)',
+      ],
+      'include_dirs': [
+        '<(DEPTH)',
+        '<(SHARED_INTERMEDIATE_DIR)/staging/android',
+        '<(android_ndk_include)',  # For native_window.h, GL includes, etc.
+        '<(DEPTH)/skia/config',
+      ],
+      'link_settings': {
+        'libraries': [
+          '-landroid',      # ANativeWindow
+          '-ljnigraphics',  # NDK access to bitmap
+        ],
+      },
+      'conditions': [
+        ['safe_browsing!=0', {
+          'sources': [
+            '<(chrome_native_sources_dir)/spdy_proxy_resource_throttle.cc',
+            '<(chrome_native_sources_dir)/spdy_proxy_resource_throttle.h',
+          ],
+        }],
+      ],
+      'variables': {
+        'proto_in_dir': '<(chrome_native_sources_dir)/proto',
+        'proto_out_dir': 'chrome/browser/android/proto',
+      },
+      'includes': [ '../../build/protoc.gypi', ],
+    },
+    {
+      # GN: //chrome/android:staging_jni_headers
+      'target_name': 'staging_jni_headers',
+      'type': 'none',
+      'sources': [
+        '<@(chrome_staging_jni_files)',
+      ],
+      'variables': {
+        'jni_gen_package': 'staging/android',
+      },
+      'includes': [ '../../build/jni_generator.gypi' ],
+    },
+    {
+      # GN: //chrome/android:chrome_staging_java
+      'target_name': 'chrome_staging_java',
+      'type': 'none',
+      'variables': {
+        'java_in_dir': '<(chrome_java_dir)',
+        'R_package': 'com.google.android.apps.chrome',
+        'R_package_relpath': 'com/google/android/apps/chrome',
+        'has_java_resources': 1,
+        'res_channel_dir': '<(chrome_java_dir)/res_default',
+        'res_extra_dirs': ['<(res_channel_dir)'],
+        'res_extra_files': ['<!@(find <(res_channel_dir) -type f)'],
+      },
+      'dependencies': [
+        # Listed first to ensure that it overrides public strings.
+        'chrome_staging_strings_grd',
+        'chrome_template_resources',
+        'hosted_service_aidl',
+        '<(DEPTH)/base/base.gyp:base_java',
+        '<(DEPTH)/chrome/chrome.gyp:chrome_java',
+        '<(DEPTH)/chrome/chrome.gyp:document_tab_model_info_proto_java',
+        '<(DEPTH)/components/components.gyp:app_restrictions_resources',
+        '<(DEPTH)/components/components.gyp:navigation_interception_java',
+        '<(DEPTH)/components/components.gyp:service_tab_launcher',
+        '<(DEPTH)/components/components.gyp:web_contents_delegate_android_java',
+        '<(DEPTH)/content/content.gyp:content_java',
+        '<(DEPTH)/media/media.gyp:media_java',
+        '<(DEPTH)/net/net.gyp:net_java',
+        '<(DEPTH)/third_party/android_protobuf/android_protobuf.gyp:protobuf_nano_javalib',
+        '<(DEPTH)/third_party/android_tools/android_tools.gyp:android_support_v13_javalib',
+        '<(DEPTH)/third_party/android_tools/android_tools.gyp:android_support_v7_appcompat_javalib',
+        '<(DEPTH)/third_party/android_tools/android_tools.gyp:android_support_v7_mediarouter_javalib',
+        '<(DEPTH)/third_party/android_tools/android_tools.gyp:android_support_v7_recyclerview_javalib',
+        '<(DEPTH)/third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_javalib',
+        '<(DEPTH)/third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
+        '<(DEPTH)/ui/android/ui_android.gyp:ui_java',
+      ],
+      'conditions': [
+        ['configuration_policy != 1', {
+          'dependencies!': [
+            '<(DEPTH)/components/components.gyp:app_restrictions_resources',
+          ],
+        }],
+      ],
+      'includes': [ '../../build/java.gypi' ],
+    },
+    {
+      'target_name': 'chrome_staging_strings_grd',
+      'type': 'none',
+      'variables': {
+        'grd_file': '<(chrome_java_dir)/strings/android_strings.grd',
+      },
+      'includes': [ '../../build/java_strings_grd.gypi' ],
+    },
+    {
+      # GN: //chrome/android:chrome_staging_test_support_java
+      'target_name': 'chrome_staging_test_support_java',
+      'type': 'none',
+      'variables': {
+          'java_in_dir': '<(chrome_java_test_support_dir)',
+      },
+      'dependencies': [
+        'chrome_staging_java',
+        '<(DEPTH)/base/base.gyp:base_java',
+        '<(DEPTH)/base/base.gyp:base_java_test_support',
+        '<(DEPTH)/chrome/chrome.gyp:chrome_java',
+        '<(DEPTH)/chrome/chrome.gyp:chrome_java_test_support',
+        '<(DEPTH)/content/content_shell_and_tests.gyp:content_java_test_support',
+        '<(DEPTH)/net/net.gyp:net_java',
+        '<(DEPTH)/net/net.gyp:net_java_test_support',
+        '<(DEPTH)/sync/sync.gyp:sync_java_test_support',
+      ],
+      'includes': [ '../../build/java.gypi' ],
+    },
+    {
+      'target_name': 'chrome_template_resources',
+      'type': 'none',
+      'variables': {
+        'jinja_inputs_base_dir': '<(chrome_java_dir)/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' ],
+    },
+    {
+      'target_name': 'hosted_service_aidl',
+      'type': 'none',
+      'variables': {
+        'aidl_interface_file': '<(chrome_java_dir)/src/org/chromium/chrome/browser/hosted/common.aidl',
+        'aidl_import_include': '<(chrome_java_dir)/src/org/chromium/chrome/browser/hosted',
+      },
+      'sources': [
+        '<(chrome_java_dir)/src/org/chromium/chrome/browser/hosted/IBrowserConnectionCallback.aidl',
+        '<(chrome_java_dir)/src/org/chromium/chrome/browser/hosted/IBrowserConnectionService.aidl',
+      ],
+      'includes': [ '../../build/java_aidl.gypi' ],
+    },
+    {
+      # GN: TODO
+      'target_name': 'libchrome_public',
+      'type': 'shared_library',
+      'dependencies': [
+        'libchrome_staging',
+        '<(DEPTH)/chrome/chrome.gyp:chrome_android_core',
+      ],
+      'include_dirs': [
+        '<(DEPTH)',
+      ],
+      'sources': [
+        '<@(chrome_public_app_native_sources)',
+      ],
+      'ldflags': [
+        # Some android targets still depend on --gc-sections to link.
+        # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
+        '-Wl,--gc-sections',
+      ],
+      'conditions': [
+        # TODO(yfriedman): move this DEP to chrome_android_core to be shared
+        # between internal/external.
+        ['cld_version==2', {
+          'dependencies': [
+            '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_dynamic',
+          ],
+        }],
+        # conditions for order_text_section
+        # Cygprofile methods need to be linked into the instrumented build.
+        ['order_profiling!=0', {
+          'conditions': [
+            ['OS=="android"', {
+              'dependencies': [ '<(DEPTH)/tools/cygprofile/cygprofile.gyp:cygprofile' ],
+            }],
+          ],
+        }],  # order_profiling!=0
+        ['use_allocator!="none"', {
+          'dependencies': [
+            '<(DEPTH)/base/allocator/allocator.gyp:allocator',
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'chrome_public_manifest',
+      'type': 'none',
+      'variables': {
+        'jinja_inputs': ['<(chrome_java_dir)/AndroidManifest.xml'],
+        'jinja_output': '<(chrome_public_apk_manifest)',
+        'jinja_variables': [
+          'channel=<(android_channel)',
+          'configuration_policy=<(configuration_policy)',
+          'manifest_package=<(manifest_package)',
+          'min_sdk_version=16',
+        ],
+      },
+      'includes': [ '../../build/android/jinja_template.gypi' ],
+    },
+    {
+      'target_name': 'chrome_public_apk',
+      'type': 'none',
+      'variables': {
+        'android_manifest_path': '<(chrome_public_apk_manifest)',
+        'apk_name': 'ChromePublic',
+        'native_lib_target': 'libchrome_public',
+        'java_in_dir': '<(chrome_java_dir)',
+        '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.
+          ['component != "shared_library" and profiling==0 and (target_arch == "arm64" or target_arch == "x86_64")', {
+            'load_library_from_zip_file': '<(chrome_apk_load_library_from_zip)',
+            'load_library_from_zip': '<(chrome_apk_load_library_from_zip)',
+          }],
+        ],
+      },
+      'dependencies': [
+        'chrome_android_paks_copy',
+        'chrome_staging_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/browser/android:chrome_staging_unittests
+      'target_name': 'chrome_staging_unittests',
+      'type': 'static_library',
+      'sources': [
+        '<(chrome_native_sources_dir)/contextualsearch/contextual_search_delegate_unittest.cc',
+        '<(chrome_native_sources_dir)/history_report/delta_file_commons_unittest.cc',
+        '<(chrome_native_sources_dir)/history_report/delta_file_backend_leveldb_unittest.cc',
+        '<(chrome_native_sources_dir)/history_report/usage_reports_buffer_backend_unittest.cc',
+        '<(chrome_native_sources_dir)/policy/policy_manager_unittest.cc',
+      ],
+      'dependencies': [
+        'libchrome_staging',
+        '<(DEPTH)/base/base.gyp:base_java',
+        '<(DEPTH)/chrome/chrome.gyp:chrome_java',
+        '<(DEPTH)/chrome/chrome.gyp:test_support_unit',
+        '<(DEPTH)/net/net.gyp:net_test_support',
+        '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
+        '<(DEPTH)/testing/gtest.gyp:gtest',
+      ],
+       'include_dirs': [
+        '<(DEPTH)',
+      ],
+    },
+    {
+      # GN: None.
+      # This target is for sharing tests between both upstream and internal
+      # trees until sufficient test coverage is upstream.
+      'target_name': 'chrome_shared_test_java',
+      'type': 'none',
+      'variables': {
+        'java_in_dir': '<(chrome_java_tests_dir)',
+      },
+      'dependencies': [
+        'chrome_staging_java',
+        'chrome_staging_test_support_java',
+        '<(DEPTH)/base/base.gyp:base_java',
+        '<(DEPTH)/base/base.gyp:base_java_test_support',
+        '<(DEPTH)/chrome/chrome.gyp:chrome_java',
+        '<(DEPTH)/chrome/chrome.gyp:chrome_java_test_support',
+        '<(DEPTH)/components/components.gyp:web_contents_delegate_android_java',
+        '<(DEPTH)/content/content_shell_and_tests.gyp:content_java_test_support',
+        '<(DEPTH)/net/net.gyp:net_java',
+        '<(DEPTH)/net/net.gyp:net_java_test_support',
+        '<(DEPTH)/sync/sync.gyp:sync_java_test_support',
+        '<(DEPTH)/third_party/android_tools/android_tools.gyp:android_support_v7_appcompat_javalib',
+      ],
+      'includes': [ '../../build/java.gypi' ],
+    },
+    {
+      # GN: None. This will most likely be merged with chrome_shell before GN is
+      # done.
+      'target_name': 'chrome_public_test_apk_manifest',
+      'type': 'none',
+      'variables': {
+        'jinja_inputs': ['<(chrome_java_tests_dir)/AndroidManifest.xml'],
+        'jinja_output': '<(chrome_public_test_apk_manifest)',
+        'jinja_variables': [
+          'manifest_package=<(manifest_package)',
+        ],
+      },
+      'includes': [ '../../build/android/jinja_template.gypi' ],
+    },
+    {
+      # GN: None. This will most likely be merged with chrome_shell before GN is
+      # done.
+      'target_name': 'chrome_public_test_apk',
+      'type': 'none',
+      'dependencies': [
+        'chrome_shared_test_java',
+        'chrome_public_apk_java',
+      ],
+      'variables': {
+        'android_manifest_path': '<(chrome_public_test_apk_manifest)',
+        'package_name': 'chrome_public_test',
+        'java_in_dir': '<(chrome_java_tests_dir)',
+        'java_in_dir_suffix': '/src_dummy',
+        'apk_name': 'ChromePublicTest',
+        'is_test_apk': 1,
+      },
+      'includes': [ '../../build/java_apk.gypi' ],
+    },
+  ],
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2: