Convert native strip from rule to action

build/java_apk.gypi

Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index 14c40850e9c0700359bd781325bb628d375acfc7..a17096bce62882c0625da2e7e75201bb640bf485 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -71,11 +71,7 @@
     'resource_input_paths': [],
     'intermediate_dir': '<(PRODUCT_DIR)/<(_target_name)',
     'asset_location%': '<(intermediate_dir)/assets',
-    'codegen_stamp': '<(intermediate_dir)/codegen.stamp',
     'compile_input_paths': [ ],
-    'compile_stamp': '<(intermediate_dir)/compile.stamp',
-    'jar_stamp': '<(intermediate_dir)/jar.stamp',
-    'obfuscate_stamp': '<(intermediate_dir)/obfuscate.stamp',
     'classes_dir': '<(intermediate_dir)/classes',
     'javac_includes': [],
     'jar_excluded_classes': [],
@@ -88,7 +84,13 @@
     'native_libraries_template': '<(DEPTH)/content/public/android/java/src/org/chromium/content/app/NativeLibraries.java',
     'native_libraries_java_dir': '<(intermediate_dir)/native_libraries_java/',
     'native_libraries_java_path': '<(intermediate_dir)/native_libraries_java/NativeLibraries.java',
+
     'native_libraries_stamp': '<(intermediate_dir)/native_libraries.stamp',
+    'strip_stamp': '<(intermediate_dir)/strip.stamp',
+    'codegen_stamp': '<(intermediate_dir)/codegen.stamp',
+    'compile_stamp': '<(intermediate_dir)/compile.stamp',
+    'jar_stamp': '<(intermediate_dir)/jar.stamp',
+    'obfuscate_stamp': '<(intermediate_dir)/obfuscate.stamp',
   },
   'sources': [
       '<@(native_libs_paths)',

[Yaron, 2013/03/29 00:17:03]

It seems like this is unneeded now. Actually probably as of
https://codereview.chromium.org/12939021/?

[cjhopman, 2013/03/29 20:37:09]

Done.

@@ -101,29 +103,6 @@
       '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': {
@@ -182,6 +161,29 @@
             '--stamp=<(native_libraries_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_path)'
+          ],
+          '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_path)',
+          ],
+        },
       ],
     }],
     ['java_strings_grd != ""', {
@@ -397,11 +399,10 @@
       '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)',
+        '<(strip_stamp)',
       ],
       'conditions': [
         ['is_test_apk == 1', {