[Android] Fix forwarder for the component build

build/java_apk.gypi

 # 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.
 
 # This file is meant to be included into a target to provide a rule
 # to build Android APKs in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my_package_apk',
@@ skipping 89 matching lines @@
     'android_manifest_path%': '<(java_in_dir)/AndroidManifest.xml',
     'push_stamp': '<(intermediate_dir)/push.stamp',
     'link_stamp': '<(intermediate_dir)/link.stamp',
     'package_resources_stamp': '<(intermediate_dir)/package_resources.stamp',
     'codegen_input_paths': [],
     'keystore_path': '<(DEPTH)/build/android/ant/chromium-debug.keystore',
     'unsigned_apk_path': '<(intermediate_dir)/<(apk_name)-unsigned.apk',
     'final_apk_path%': '<(PRODUCT_DIR)/apks/<(apk_name).apk',
     'source_dir': '<(java_in_dir)/src',
     'apk_install_stamp': '<(intermediate_dir)/apk_install.stamp',
-    'strip_output_paths': [],
     'apk_package_native_libs_dir': '<(intermediate_dir)/libs',
   },
   # Pass the jar path to the apk's "fake" jar target.  This would be better as
   # direct_dependent_settings, but a variable set by a direct_dependent_settings
   # cannot be lifted in a dependent to all_dependent_settings.
   'all_dependent_settings': {
     'variables': {
       'apk_output_jar_path': '<(PRODUCT_DIR)/lib.java/<(jar_name)',
     },
   },
   'conditions': [
     ['resource_dir!=""', {
       'variables': {
         'resource_input_paths': [ '<!@(find <(resource_dir) -name "*")' ]
       },
     }],
     ['R_package != ""', {
       'variables': {
         # We generate R.java in package R_package (in addition to the package
         # listed in the AndroidManifest.xml, which is unavoidable).
         'additional_res_dirs': ['<(DEPTH)/build/android/ant/empty/res'],
         'additional_res_packages': ['<(R_package)'],
         'additional_R_text_files': ['<(PRODUCT_DIR)/<(package_name)/R.txt'],
       },
     }],
     ['native_lib_target != "" and component == "shared_library"', {
       'dependencies': [
         '<(DEPTH)/build/android/setup.gyp:copy_system_libraries',
       ],
-      'variables': {
-        # Add a fake output to force the build to always re-run this step. This
-        # is required because the real inputs are not known at gyp-time and
-        # changing base.so may not trigger changes to dependent libraries.
-        'strip_output_paths': [
-          '<(intermediate_dir)/<(strip_stamp).fake',
-        ],
-      },
     }],
     ['native_lib_target != ""', {
       'variables': {
         'compile_input_paths': [ '<(native_libraries_java_stamp)' ],
         'generated_src_dirs': [ '<(native_libraries_java_dir)' ],
         'native_libs_paths': ['<(SHARED_LIB_DIR)/<(native_lib_target).>(android_product_extension)'],
       },
       'actions': [
         {
-          'action_name': 'ordered_libraries_<(_target_name)',
-          'message': 'Writing dependency ordered libraries for <(_target_name).',
-          'inputs': [
-            '<(DEPTH)/build/android/gyp/util/build_utils.py',
-            '<(DEPTH)/build/android/gyp/write_ordered_libraries.py',
-            '<@(native_libs_paths)',
-          ],
-          'outputs': [
-            '<(ordered_libraries_file)',
-          ],
-          'action': [
-            'python', '<(DEPTH)/build/android/gyp/write_ordered_libraries.py',
-            '--input-libraries=<(native_libs_paths)',
-            '--readelf=<(android_readelf)',
-            '--output=<(ordered_libraries_file)',
-          ],
+          'variables': {
+            'input_libraries': ['<@(native_libs_paths)'],
+          },
+          'includes': ['../build/android/write_ordered_libraries.gypi'],
         },
         {
           'action_name': 'native_libraries_template_data_<(_target_name)',
           'message': 'Creating native_libraries_list.h for <(_target_name).',
           'inputs': [
             '<(DEPTH)/build/android/gyp/util/build_utils.py',
             '<(DEPTH)/build/android/gyp/create_native_libraries_header.py',
             '<(ordered_libraries_file)',
           ],
           'outputs': [
@@ skipping 20 matching lines @@
           ],
           'action': [
             'python', '<(DEPTH)/build/android/gyp/gcc_preprocess.py',
             '--include-path=<(native_libraries_template_data_dir)',
             '--output=<(native_libraries_java_file)',
             '--template=<(native_libraries_template)',
             '--stamp=<(native_libraries_java_stamp)',
           ],
         },
         {
-          'action_name': 'strip_native_libraries',
-          'message': 'Stripping libraries for <(_target_name)',
-          'inputs': [
-            '<(DEPTH)/build/android/gyp/util/build_utils.py',
-            '<(DEPTH)/build/android/gyp/strip_library_for_apk.py',
-            '<(ordered_libraries_file)'
-          ],
-          'outputs': [
-            '<(strip_stamp)',
-            '<@(strip_output_paths)',
-          ],
-          'action': [
-            'python', '<(DEPTH)/build/android/gyp/strip_library_for_apk.py',
-            '--android-strip=<(android_strip)',
-            '--android-strip-arg=--strip-unneeded',
-            '--stripped-libraries-dir=<(apk_libraries_dir)',
-            '--libraries-dir=<(SHARED_LIB_DIR)',
-            '--libraries-file=<(ordered_libraries_file)',
-            '--stamp=<(strip_stamp)',
-          ],
+          'variables': {
+            'stripped_libraries_dir': '<(libraries_source_dir)',
+          },
+          'includes': ['../build/android/strip_native_libraries.gypi'],
         },
       ],
       'conditions': [
         ['gyp_managed_install == 1', {
           'variables': {
-            'apk_libraries_dir': '<(intermediate_dir)/lib.stripped/<(android_app_abi)',
+            'libraries_source_dir': '<(intermediate_dir)/lib.stripped/<(android_app_abi)',
             'apk_package_native_libs_dir': '<(intermediate_dir)/libs.managed',
             'device_library_dir': '/data/local/tmp/chromium/lib.stripped/<(_target_name)',
           },
           'dependencies': [
             '<(DEPTH)/tools/android/md5sum/md5sum.gyp:md5sum',
           ],
           'actions': [
             {
-              'action_name': 'push_libraries_<(_target_name)',
-              'message': 'Pushing libraries to device for <(_target_name)',
-              'inputs': [
-                '<(DEPTH)/build/android/gyp/util/build_utils.py',
-                '<(DEPTH)/build/android/gyp/util/md5_check.py',
-                '<(DEPTH)/build/android/gyp/push_libraries.py',
-                '<(strip_stamp)',
-              ],
-              'outputs': [
-                '<(push_stamp)',
-                # If a user switches the connected device, new libraries may
-                # need to be pushed even if there have been no changes. To
-                # ensure that the libraries on the device are always
-                # up-to-date, this step should always be triggered.
-                '<(push_stamp).fake',
-              ],
-              'action': [
-                'python', '<(DEPTH)/build/android/gyp/push_libraries.py',
-                '--libraries-dir=<(apk_libraries_dir)',
-                '--device-dir=<(device_library_dir)',
-                '--libraries-json=<(ordered_libraries_file)',
-                '--stamp=<(push_stamp)',
-              ],
+              'includes': ['../build/android/push_libraries.gypi'],
             },
             {
               'action_name': 'create_library_links',
               'message': 'Creating links on device for <(_target_name).',
               'inputs': [
                 '<(DEPTH)/build/android/gyp/create_device_library_links.py',
                 '<(apk_install_stamp)',
                 '<(push_stamp)'
               ],
               'outputs': [
                 '<(link_stamp)'
               ],
               'action': [
                 'python', '<(DEPTH)/build/android/gyp/create_device_library_links.py',
                 '--apk=<(final_apk_path)',
                 '--libraries-json=<(ordered_libraries_file)',
-                '--libraries-dir=<(apk_libraries_dir)',
+                '--libraries-dir=<(libraries_source_dir)',
                 '--target-dir=<(device_library_dir)',
                 '--stamp=<(link_stamp)',
               ],
             },
           ],
         }, {
           # gyp_managed_install != 1
           'variables': {
-            'apk_libraries_dir': '<(apk_package_native_libs_dir)/<(android_app_abi)',
+            'libraries_source_dir': '<(apk_package_native_libs_dir)/<(android_app_abi)',
             'package_input_paths': [ '<(strip_stamp)' ],
           },
         }],
       ],
     }], # native_lib_target != ''
     ['java_strings_grd != ""', {
       'variables': {
         'res_grit_dir': '<(SHARED_INTERMEDIATE_DIR)/<(package_name)_apk/res_grit',
         'additional_res_dirs': ['<(res_grit_dir)'],
         # grit_grd_file is used by grit_action.gypi, included below.
@@ skipping 344 matching lines @@
         '--unsigned-apk-path=<(unsigned_apk_path)',
         '--final-apk-path=<(final_apk_path)',
         '--keystore-path=<(keystore_path)',
 
         # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
         '--ignore=>!(echo \'>(_inputs)\' | md5sum)',
       ],
     },
   ],
 }