Merge java_staging/src into java/src.

chrome/chrome.gyp

 # Copyright (c) 2012 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.
 {
   'variables': {
     'chromium_code': 1,
 
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
     # the link of the actual chrome (or chromium) executable on
@@ skipping 571 matching lines @@
             'connection_security_security_levels_java',
             'document_tab_model_info_proto_java',
             'profile_account_management_metrics_java',
             'content_setting_java',
             'content_settings_type_java',
             'page_info_connection_type_java',
             'profile_sync_service_model_type_selection_java',
             'resource_id_java',
             'tab_load_status_java',
             '../base/base.gyp:base',
+            '../chrome/android/chrome_apk.gyp:custom_tabs_service_aidl',
+            '../components/components.gyp:app_restrictions_resources',
             '../components/components.gyp:bookmarks_java',
             '../components/components.gyp:dom_distiller_core_java',
             '../components/components.gyp:enhanced_bookmarks_java_enums_srcjar',
             '../components/components.gyp:gcm_driver_java',
             '../components/components.gyp:invalidation_java',
             '../components/components.gyp:navigation_interception_java',
             '../components/components.gyp:service_tab_launcher_java',
             '../components/components.gyp:precache_java',
             '../components/components.gyp:variations_java',
             '../components/components.gyp:web_contents_delegate_android_java',
             '../content/content.gyp:content_java',
             '../media/media.gyp:media_java',
             '../printing/printing.gyp:printing_java',
             '../sync/sync.gyp:sync_java',
             '../third_party/android_data_chart/android_data_chart.gyp:android_data_chart_java',
             '../third_party/android_media/android_media.gyp:android_media_java',
+            '../third_party/android_protobuf/android_protobuf.gyp:protobuf_nano_javalib',
             '../third_party/android_swipe_refresh/android_swipe_refresh.gyp:android_swipe_refresh_java',
             '../third_party/android_tools/android_tools.gyp:android_support_v7_appcompat_javalib',
             '../third_party/android_tools/android_tools.gyp:android_support_v7_mediarouter_javalib',
+            '../third_party/android_tools/android_tools.gyp:android_support_v7_recyclerview_javalib',
             '../third_party/android_tools/android_tools.gyp:android_support_v13_javalib',
             '../third_party/android_tools/android_tools.gyp:google_play_services_javalib',
+            '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_javalib',
+            '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
             '../ui/android/ui_android.gyp:ui_java',
           ],
           'variables': {
             'java_in_dir': '../chrome/android/java',
             'has_java_resources': 1,
             'R_package': 'org.chromium.chrome',
             'R_package_relpath': 'org/chromium/chrome',
             # Include channel-specific resources and xml string files generated
             # from generated_resources.grd
             'res_channel_dir': '<(java_in_dir)/res_default',
             'res_extra_dirs': [
               '<(res_channel_dir)',
               '<(SHARED_INTERMEDIATE_DIR)/chrome/java/res',
             ],
             'res_extra_files': [
               '<!@(find <(res_channel_dir) -type f)',
               '<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(SHARED_INTERMEDIATE_DIR)/chrome" app/generated_resources.grd)',
             ],
           },
+          'conditions': [
+            ['configuration_policy != 1', {
+              'dependencies!': [
+                '../components/components.gyp:app_restrictions_resources',
+              ],
+            }],
+          ],
           'includes': [
             '../build/java.gypi',
           ],
         },
         {
           # GN: //chrome/android:chrome_strings_grd
           'target_name': 'chrome_strings_grd',
           'type': 'none',
           'variables': {
             'grd_file': '../chrome/android/java/strings/android_chrome_strings.grd',
@@ skipping 174 matching lines @@
                   '<(DEPTH)/third_party/kasko'
                 ],
               },
             },
           },
         },
       ],
     }],
   ],  # 'conditions'
 }