Trigger some java_apk.gypi actions for all 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 84 matching lines @@
     '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',
     'push_stamp': '<(intermediate_dir)/push.stamp',
     'link_stamp': '<(intermediate_dir)/link.stamp',
     'codegen_input_paths': [],
     'final_apk_path': '<(PRODUCT_DIR)/apks/<(apk_name).apk',
     'apk_install_stamp': '<(intermediate_dir)/apk_install.stamp',
+    'strip_output_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)',
     },
   },
   '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 != [] 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

[Yaron, 2013/04/04 20:24:23]

Can you inline this like the other variables? Nicer to have the explanation
right in the outputs step, and it doesn't look like this is re-used anywhere.
Oh, this was done so that it's only conditionally executed, right? I think we
should only do this if we're doing a managed install. I can imagine thaat at
least at first our components bots won't use managed install.

[cjhopman, 2013/04/04 21:13:19]

This one has run even if it isn't a managed_install. The strip step is used for
all builds (that have native libraries) and for the component build we can't
specify the correct inputs.

It is added here because it is only needed in the component build, not the
non-component build.

[Yaron, 2013/04/10 20:37:13]

Can you file/link to a bug to remove this when it can be known at gyp time?

+        # 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_libs_paths != []', {
       'variables': {
         'compile_input_paths': [ '<(native_libraries_java_stamp)' ],
         'generated_src_dirs': [ '<(native_libraries_java_dir)' ],
       },
       'actions': [
         {
           'action_name': 'ordered_libraries_<(_target_name)',
           'message': 'Writing dependency ordered libraries for <(_target_name).',
@@ skipping 53 matching lines @@
         {
           '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)',
           ],
@@ skipping 12 matching lines @@
             {
               '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)'
+                '<(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)',
               ],
             },
             {
@@ skipping 52 matching lines @@
         {
           'action_name': 'apk_install_<(_target_name)',
           'message': 'Installing <(apk_name).apk',
           'inputs': [
             '<(DEPTH)/build/android/gyp/util/build_utils.py',
             '<(DEPTH)/build/android/gyp/apk_install.py',
             '<(final_apk_path)',
           ],
           'outputs': [
             '<(apk_install_stamp)'
+            # If a user switches the connected device, the APK may need to be
+            # installed even if there have been no changes. To ensure that the
+            # APK on the device is always up-to-date, this step should always
+            # be triggered.
+            '<(apk_install_stamp).fake',
           ],
           'action': [
             'python', '<(DEPTH)/build/android/gyp/apk_install.py',
             '--android-sdk-tools=<(android_sdk_tools)',
             '--apk-path=<(final_apk_path)',
             '--stamp=<(apk_install_stamp)'
           ],
         },
       ],
     }],
@@ skipping 232 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)',
 
       ]
     },
   ],
 }