Merge java_staging/src into java/src.

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.
     # 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': [
      {
       # TODO(newt): delete this once all references are gone.
       'target_name': 'libchrome_staging',
       'type': 'none',
     },
     {
-      # GN: //chrome/android:chrome_staging_java
+      # TODO(newt): delete this once all references are gone.
       'target_name': 'chrome_staging_java',
       'type': 'none',
-      'variables': {
-        'java_in_dir': '<(chrome_java_dir)',
-      },
-      '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',
-        '<(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' ],
     },
     {
       # GN: //chrome/test/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' ],
     },
     {
       # GN: //chrome/android:custom_tabs_service_aidl
       'target_name': 'custom_tabs_service_aidl',
       'type': 'none',
       'variables': {
-        'aidl_interface_file': '<(chrome_java_dir)/src/org/chromium/chrome/browser/customtabs/common.aidl',
-        'aidl_import_include': '<(chrome_java_dir)/src/org/chromium/chrome/browser/customtabs',
+        'aidl_interface_file': 'java/src/org/chromium/chrome/browser/customtabs/common.aidl',
+        'aidl_import_include': 'java/src/org/chromium/chrome/browser/customtabs',
       },
       'sources': [
-        '<(chrome_java_dir)/src/org/chromium/chrome/browser/customtabs/ICustomTabsConnectionCallback.aidl',
-        '<(chrome_java_dir)/src/org/chromium/chrome/browser/customtabs/ICustomTabsConnectionService.aidl',
+        'java/src/org/chromium/chrome/browser/customtabs/ICustomTabsConnectionCallback.aidl',
+        'java/src/org/chromium/chrome/browser/customtabs/ICustomTabsConnectionService.aidl',
       ],
       'includes': [ '../../build/java_aidl.gypi' ],
     },
     {
       # GN: //chrome/android:chrome_public_template_resources
       'target_name': 'chrome_public_template_resources',
       'type': 'none',
       'variables': {
         'jinja_inputs_base_dir': 'java/res_template',
         'jinja_inputs': [
@@ skipping 73 matching lines @@
       '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_public',
-        'java_in_dir': '<(chrome_java_dir)',
+        'java_in_dir': 'java',
         '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_public_template_resources',
-        'chrome_staging_java',
+        '../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': [
@@ skipping 24 matching lines @@
     {
       # 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',
@@ skipping 40 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: