Fix race condition in gyp/ninja builds.

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 85 matching lines @@
     'compile_stamp': '<(intermediate_dir)/compile.stamp',
     'lint_stamp': '<(intermediate_dir)/lint.stamp',
     'lint_result': '<(intermediate_dir)/lint_result.xml',
     'lint_config': '<(intermediate_dir)/lint_config.xml',
     'never_lint%': 0,
     'instr_stamp': '<(intermediate_dir)/instr.stamp',
     'jar_stamp': '<(intermediate_dir)/jar.stamp',
     'obfuscate_stamp': '<(intermediate_dir)/obfuscate.stamp',
     'pack_arm_relocations_stamp': '<(intermediate_dir)/pack_arm_relocations.stamp',
     'strip_stamp': '<(intermediate_dir)/strip.stamp',
-    'stripped_libraries_dir': '<(SHARED_INTERMEDIATE_DIR)/stripped_libraries',
+    'stripped_libraries_dir': '<(intermediate_dir)/stripped_libraries',
     'strip_additional_stamp': '<(intermediate_dir)/strip_additional.stamp',
     'classes_dir': '<(intermediate_dir)/classes/2',
     'javac_includes': [],
     'jar_excluded_classes': [],
     'javac_jar_path': '<(intermediate_dir)/<(_target_name).javac.jar',
     'jar_path': '<(PRODUCT_DIR)/lib.java/<(jar_name)',
     'obfuscated_jar_path': '<(intermediate_dir)/obfuscated.jar',
     'test_jar_path': '<(PRODUCT_DIR)/test.lib.java/<(apk_name).jar',
     'dex_path': '<(intermediate_dir)/classes.dex',
     'emma_device_jar': '<(android_sdk_root)/tools/lib/emma_device.jar',
@@ skipping 250 matching lines @@
               '<(libchromium_android_linker)',
             ],
             'ordered_libraries_file%': '<(ordered_libraries_file)',
             'stripped_libraries_dir%': '<(stripped_libraries_dir)',
             'packed_libraries_dir': '<(libraries_source_dir)',
             'input_paths': [
               '<(strip_stamp)',
             ],
             'stamp': '<(pack_arm_relocations_stamp)',
           },
-          'dependencies': [
-            'strip_native_libraries',
-          ],
           'includes': ['../build/android/pack_arm_relocations.gypi'],
         },
         {
           'variables': {
             'input_libraries': [
               '<@(additional_bundled_libs)',
             ],
             'ordered_libraries_file': '<(additional_ordered_libraries_file)',
             'subtarget': '_additional_libraries',
           },
@@ skipping 55 matching lines @@
             },
           ],
           'conditions': [
             ['create_standalone_apk == 1', {
               'actions': [
                 {
                   'action_name': 'create standalone APK',
                   'variables': {
                     'inputs': [
                       '<(ordered_libraries_file)',
-                      '<(strip_stamp)',
+                      '<(pack_arm_relocations_stamp)',
                       '<(strip_additional_stamp)',
                     ],
                     'input_apk_path': '<(unsigned_apk_path)',
                     'output_apk_path': '<(unsigned_standalone_apk_path)',
                     'libraries_top_dir%': '<(libraries_top_dir)',
                   },
                   'includes': [ 'android/create_standalone_apk_action.gypi' ],
                 },
               ],
             }],
           ],
         }, {
           # gyp_managed_install != 1
           'variables': {
             'libraries_source_dir': '<(apk_package_native_libs_dir)/<(android_app_abi)',
             'package_input_paths': [
-              '<(strip_stamp)',
+              '<(pack_arm_relocations_stamp)',
               '<(strip_additional_stamp)',
             ],
           },
         }],
       ],
     }], # native_lib_target != ''
     ['gyp_managed_install == 0 or create_standalone_apk == 1', {
       'actions': [
         {
           'action_name': 'finalize standalone apk',
@@ skipping 397 matching lines @@
         '-DEMMA_INSTRUMENT=<(emma_instrument)',
         '-DEMMA_DEVICE_JAR=<(emma_device_jar)',
 
         '-Dbasedir=.',
         '-buildfile',
         '<(DEPTH)/build/android/ant/apk-package.xml',
       ]
     },
   ],
 }