Revert of Add creation of v14 compatible resources to process_resources.py

build/java.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 Java in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my-package_java',
@@ skipping 93 matching lines @@
     'variables': {
       'input_jars_paths': ['<(jar_final_path)'],
       'library_dexed_jars_paths': ['<(dex_path)'],
     },
   },
   'conditions': [
     ['has_java_resources == 1', {
       'variables': {
         'res_dir': '<(java_in_dir)/res',
         'res_crunched_dir': '<(intermediate_dir)/res_crunched',
+        'res_v14_compatibility_stamp': '<(intermediate_dir)/res_v14_compatibility.stamp',
         'res_v14_compatibility_dir': '<(intermediate_dir)/res_v14_compatibility',
         'res_input_dirs': ['<(res_dir)', '<@(res_extra_dirs)'],
         'resource_input_paths': ['<!@(find <(res_dir) -type f)'],
         'R_dir': '<(intermediate_dir)/java_R',
         'R_text_file': '<(R_dir)/R.txt',
         'R_stamp': '<(intermediate_dir)/resources.stamp',
         'generated_src_dirs': ['<(R_dir)'],
-        'additional_input_paths': ['<(R_stamp)', ],
+        'additional_input_paths': ['<(R_stamp)',
+                                   '<(res_v14_compatibility_stamp)',],
         'additional_res_dirs': [],
         'dependencies_res_input_dirs': [],
         'dependencies_res_files': [],
       },
       'all_dependent_settings': {
         'variables': {
           # Dependent jars include this target's R.java file via
           # generated_R_dirs and include its resources via
           # dependencies_res_files.
           'generated_R_dirs': ['<(R_dir)'],
-          'additional_input_paths': ['<(R_stamp)', ],
+          'additional_input_paths': ['<(R_stamp)',
+                                     '<(res_v14_compatibility_stamp)',],
           'dependencies_res_files': ['<@(resource_input_paths)'],
 
           'dependencies_res_input_dirs': ['<@(res_input_dirs)'],
 
           # Dependent APKs include this target's resources via
           # additional_res_dirs, additional_res_packages, and
           # additional_R_text_files.
           'additional_res_dirs': [
               # The order of these is important to ensure that the proper
               # version (i.e. the crunched version) of resources takes
@@ skipping 12 matching lines @@
           'action_name': 'process_resources',
           'message': 'processing resources for <(_target_name)',
           'variables': {
             'android_manifest': '<(DEPTH)/build/android/AndroidManifest.xml',
             # Include the dependencies' res dirs so that references to
             # resources in dependencies can be resolved.
             'dependencies_res_dirs': ['<@(res_extra_dirs)',
                                       '>@(dependencies_res_input_dirs)',],
             # Write the inputs list to a file, so that its mtime is updated when
             # the list of inputs changes.
-            'inputs_list_file': '>|(java_resources.<(_target_name).gypcmd >@(resource_input_paths) >@(dependencies_res_files))',
-            'process_resources_options': [],
-            'conditions': [
-              ['res_v14_verify_only == 1', {
-                'process_resources_options': ['--v14-verify-only']
-              }],
-            ],
+            'inputs_list_file': '>|(java_resources.<(_target_name).gypcmd >@(resource_input_paths) >@(dependencies_res_files))'
           },
           'inputs': [
             '<(DEPTH)/build/android/gyp/util/build_utils.py',
             '<(DEPTH)/build/android/gyp/process_resources.py',
-            '<(DEPTH)/build/android/gyp/generate_v14_compatible_resources.py',
             '>@(resource_input_paths)',
             '>@(dependencies_res_files)',
             '>(inputs_list_file)',
           ],
           'outputs': [
             '<(R_stamp)',
           ],
           'action': [
             'python', '<(DEPTH)/build/android/gyp/process_resources.py',
             '--android-sdk', '<(android_sdk)',
             '--android-sdk-tools', '<(android_sdk_tools)',
             '--R-dir', '<(R_dir)',
             '--dependencies-res-dirs', '>(dependencies_res_dirs)',
             '--resource-dir', '<(res_dir)',
-            '--res-v14-compatibility-dir', '<(res_v14_compatibility_dir)',
             '--crunch-output-dir', '<(res_crunched_dir)',
             '--android-manifest', '<(android_manifest)',
             '--non-constant-id',
             '--custom-package', '<(R_package)',
             '--stamp', '<(R_stamp)',
-            '<@(process_resources_options)',
           ],
         },
+        # Generate API 14 resources.
+        {
+          'action_name': 'generate_api_14_resources_<(_target_name)',
+          'message': 'Generating Android API 14 resources <(_target_name)',
+          'variables' : {
+            'res_v14_additional_options': [],
+          },
+          'conditions': [
+            ['res_v14_verify_only == 1', {
+              'variables': {
+                'res_v14_additional_options': ['--verify-only']
+              },
+            }],
+          ],
+          'inputs': [
+            '<(DEPTH)/build/android/gyp/util/build_utils.py',
+            '<(DEPTH)/build/android/gyp/generate_v14_compatible_resources.py',
+            '>@(resource_input_paths)',
+          ],
+          'outputs': [
+            '<(res_v14_compatibility_stamp)',
+          ],
+          'action': [
+            'python', '<(DEPTH)/build/android/gyp/generate_v14_compatible_resources.py',
+            '--res-dir=<(res_dir)',
+            '--res-v14-compatibility-dir=<(res_v14_compatibility_dir)',
+            '--stamp', '<(res_v14_compatibility_stamp)',
+            '<@(res_v14_additional_options)',
+          ]
+        },
       ],
     }],
     ['proguard_preprocess == 1', {
       'actions': [
         {
           'action_name': 'proguard_<(_target_name)',
           'message': 'Proguard preprocessing <(_target_name) jar',
           'inputs': [
             '<(android_sdk_root)/tools/proguard/bin/proguard.sh',
             '<(DEPTH)/build/android/gyp/util/build_utils.py',
@@ skipping 124 matching lines @@
             'dex_no_locals': 1,
           }],
         ],
         'dex_input_paths': [ '<(jar_final_path)' ],
         'output_path': '<(dex_path)',
       },
       'includes': [ 'android/dex_action.gypi' ],
     },
   ],
 }