Convert native strip from rule to action

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 56 matching lines @@
     'additional_res_dirs': [],
     'additional_res_packages': [],
     'is_test_apk%': 0,
     'java_strings_grd%': '',
     'library_manifest_paths' : [],
     'resource_input_paths': [],
     'intermediate_dir': '<(PRODUCT_DIR)/<(_target_name)',
     'asset_location%': '<(intermediate_dir)/assets',
     'codegen_stamp': '<(intermediate_dir)/codegen.stamp',
     'compile_input_paths': [ ],
+    'package_input_paths': [ ],
     'ordered_libraries_file': '<(intermediate_dir)/native_libraries.json',
     # TODO(cjhopman): build/ shouldn't refer to content/. The libraryloader and
     # nativelibraries template should be moved out of content/ (to base/?).
     # http://crbug.com/225101
     'native_libraries_template': '<(DEPTH)/content/public/android/java/templates/NativeLibraries.template',
     'native_libraries_java_dir': '<(intermediate_dir)/native_libraries_java/',
     'native_libraries_java_file': '<(native_libraries_java_dir)/NativeLibraries.java',
     'native_libraries_java_stamp': '<(intermediate_dir)/native_libraries_java.stamp',
     'native_libraries_template_data_dir': '<(intermediate_dir)/native_libraries/',
     'native_libraries_template_data_file': '<(native_libraries_template_data_dir)/native_libraries_array.h',
     'native_libraries_template_data_stamp': '<(intermediate_dir)/native_libraries_template_data.stamp',
     'compile_stamp': '<(intermediate_dir)/compile.stamp',
     'jar_stamp': '<(intermediate_dir)/jar.stamp',
     'obfuscate_stamp': '<(intermediate_dir)/obfuscate.stamp',
+    'strip_stamp': '<(intermediate_dir)/strip.stamp',
     'classes_dir': '<(intermediate_dir)/classes',
     'javac_includes': [],
     'jar_excluded_classes': [],
     'jar_path': '<(PRODUCT_DIR)/lib.java/<(jar_name)',
     'obfuscated_jar_path': '<(intermediate_dir)/obfuscated.jar',
     'dex_path': '<(intermediate_dir)/classes.dex',
     'android_manifest': '<(java_in_dir)/AndroidManifest.xml',
     'codegen_input_paths': [],
   },
-  'sources': [
-      '<@(native_libs_paths)',
-  ],
   # 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)',
     },
   },
-  'rules': [
-    {
-      'rule_name': 'copy_and_strip_native_libraries',
-      'extension': 'so',
-      'variables': {
-        'apk_libraries_dir': '<(intermediate_dir)/libs/<(android_app_abi)',
-        'stripped_library_path': '<(apk_libraries_dir)/<(RULE_INPUT_ROOT).so',
-      },
-      'inputs': [
-        '<(DEPTH)/build/android/strip_library_for_apk.py',
-      ],
-      'outputs': [
-        '<(stripped_library_path)',
-      ],
-      'action': [
-        'python', '<(DEPTH)/build/android/strip_library_for_apk.py',
-        '--android-strip=<(android_strip)',
-        '--android-strip-arg=--strip-unneeded',
-        '--stripped-libraries-dir=<(apk_libraries_dir)',
-        '<(RULE_INPUT_PATH)',
-      ],
-    },
-  ],
   '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_libs_paths != []', {
       'variables': {
         'compile_input_paths': [ '<(native_libraries_java_stamp)' ],
         'generated_src_dirs': [ '<(native_libraries_java_dir)' ],
+        'package_input_paths': [ '<(strip_stamp)' ],
       },
       'actions': [
         {
           'action_name': 'ordered_libraries_<(_target_name)',
           'message': 'Writing dependency ordered libraries for <(_target_name).',
           'inputs': [
             '<(DEPTH)/build/android/pylib/build_utils.py',
             '<(DEPTH)/build/android/write_ordered_libraries.py',
             '<@(native_libs_paths)',
           ],
@@ skipping 37 matching lines @@
             '<(native_libraries_java_stamp)',
           ],
           'action': [
             'python', '<(DEPTH)/build/android/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)',
+          'variables': {
+            'apk_libraries_dir': '<(intermediate_dir)/libs/<(android_app_abi)',
+          },
+          'inputs': [
+            '<(DEPTH)/build/android/pylib/build_utils.py',
+            '<(DEPTH)/build/android/strip_library_for_apk.py',
+            '<(ordered_libraries_file)'
+          ],
+          'outputs': [
+            '<(strip_stamp)',
+          ],
+          'action': [
+            'python', '<(DEPTH)/build/android/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)',
+          ],
+        },
       ],
     }], # native_libs_paths != []
     ['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.
         'grit_grd_file': '<(java_in_dir)/strings/<(java_strings_grd)',
         'resource_input_paths': [
           '<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(res_grit_dir)" <(grit_grd_file))'
@@ skipping 196 matching lines @@
 
         '>@(dex_inputs)',
         '>@(dex_generated_inputs)',
       ]
     },
     {
       'action_name': 'ant_package_<(_target_name)',
       'message': 'Packaging <(_target_name).',
       'inputs': [
         '<(DEPTH)/build/android/ant/apk-package.xml',
-        #TODO(cjhopman): this should be the stripped library paths.
-        '>@(native_libs_paths)',
         '<(dex_path)',
         '<(codegen_stamp)',
         '<(obfuscate_stamp)',
+        '>@(package_input_paths)',
       ],
       'conditions': [
         ['is_test_apk == 1', {
           'variables': {
             'additional_res_dirs=': [],
             'additional_res_packages=': [],
           }
         }],
       ],
       'outputs': [
@@ skipping 24 matching lines @@
 
         # Add list of inputs to the command line, so if inputs change
         # (e.g. if a Java file is removed), the command will be re-run.
         # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
         '-DTHIS_IS_IGNORED=>!(echo \'>(_inputs)\' | md5sum)',
 
       ]
     },
   ],
 }