Merge libchrome_staging target into browser.

chrome/android/chrome_apk.gyp

 # 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',
     '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/rlz/RevenueStats.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)/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/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
+     {
+      # TODO(newt): delete this once all references are gone.
       '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',
-          ],
-        }],
-      ],
-    },
-    {
-      # 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)',

[Yaron, 2015/06/19 13:53:58]

I think this is evidence of poor test coverage. You've moved the c++ filers into
the browser target but not java. That means that the unit_tests suite has the
c++ but not corresponding jni bindings. I'm fine with this as an interim step
(esp since you'll be moving java over next) but I don't think this logically
should work.

[newt (away), 2015/06/19 16:47:07]

Yeah. I guess the C++ files I've moved are tested only via Java instrumentation
tests, if at all.

         'R_package': 'com.google.android.apps.chrome',
         'R_package_relpath': 'com/google/android/apps/chrome',
         'has_java_resources': 1,
       },
       'dependencies': [
         'custom_tabs_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',
@@ skipping 76 matching lines @@
           'dependencies_res_zip_paths': ['<(jinja_outputs_zip)'],
         },
       },
       'includes': [ '../../build/android/jinja_template.gypi' ],
     },
     {
       # GN: //chrome/android:chrome_public
       '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.
@@ skipping 72 matching lines @@
       # 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
+      # TODO(newt): delete this target once all references are gone.
       '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',
+        # This file is already tested elsewhere but is included here to
+        # prevent this from being an empty static_library, which would
+        # break the the test APK that depends on this.
+        '../browser/android/policy/policy_manager_unittest.cc',
       ],
       'dependencies': [
-        'libchrome_staging',
         '<(DEPTH)/base/base.gyp:base_java',
+        '<(DEPTH)/chrome/chrome.gyp:browser',
         '<(DEPTH)/chrome/chrome.gyp:chrome_java',
-        '<(DEPTH)/chrome/chrome.gyp:delta_file_proto',
         '<(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)',
       },
@@ skipping 52 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: