Revert of Remove apk-codegen.xml

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 415 matching lines @@
       'dependencies': [
         '<(DEPTH)/tools/android/android_tools.gyp:android_tools',
       ]
     }],
   ],
   'dependencies': [
     '<(DEPTH)/tools/android/md5sum/md5sum.gyp:md5sum',
   ],
   'actions': [
     {
-      'action_name': 'process_resources',
-      'message': 'processing resources for <(_target_name)',
-      'variables': {
-        # Write the inputs list to a file, so that its mtime is updated when
-        # the list of inputs changes.
-        'inputs_list_file': '>|(apk_codegen.<(_target_name).gypcmd >@(additional_input_paths) >@(resource_input_paths))',
-      },
+      'action_name': 'ant_codegen_<(_target_name)',
+      'message': 'Generating R.java for <(_target_name)',
       'conditions': [
         ['is_test_apk == 1', {
           'variables': {
             'additional_res_dirs=': [],
             'additional_res_packages=': [],
           }
         }],
       ],
+      'variables': {
+        # Write the inputs list to a file, so that its mtime is updated when
+        # the list of inputs changes.
+        'inputs_list_file': '>|(apk_codegen.<(_target_name).gypcmd >@(additional_input_paths) >@(resource_input_paths))'
+      },
       'inputs': [
+        '<(DEPTH)/build/android/ant/apk-codegen.xml',
         '<(DEPTH)/build/android/gyp/util/build_utils.py',
-        '<(DEPTH)/build/android/gyp/process_resources.py',
+        '<(DEPTH)/build/android/gyp/ant.py',
         '<(android_manifest_path)',
         '>@(additional_input_paths)',
         '>@(resource_input_paths)',
         '>(inputs_list_file)',
       ],
       'outputs': [
         '<(codegen_stamp)',
       ],
       'action': [
-        'python', '<(DEPTH)/build/android/gyp/process_resources.py',
-        '--android-sdk', '<(android_sdk)',
-        '--android-sdk-tools', '<(android_sdk_tools)',
+        'python', '<(DEPTH)/build/android/gyp/ant.py',
+        '-quiet',
+        '-DADDITIONAL_RES_DIRS=>(additional_res_dirs)',
+        '-DADDITIONAL_RES_PACKAGES=>(additional_res_packages)',
+        '-DADDITIONAL_R_TEXT_FILES=>(additional_R_text_files)',
+        '-DANDROID_MANIFEST=<(android_manifest_path)',
+        '-DANDROID_SDK_JAR=<(android_sdk_jar)',
+        '-DANDROID_SDK_ROOT=<(android_sdk_root)',
+        '-DANDROID_SDK_VERSION=<(android_sdk_version)',
+        '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
+        '-DOUT_DIR=<(intermediate_dir)',
+        '-DRESOURCE_DIR=<(resource_dir)',
 
-        '--android-manifest', '<(android_manifest_path)',
-        '--dependencies-res-dirs', '>(additional_res_dirs)',
-
-        '--extra-res-packages', '>(additional_res_packages)',
-        '--extra-r-text-files', '>(additional_R_text_files)',
-
-        '--resource-dir', '<(resource_dir)',
-        '--crunch-output-dir', '<(intermediate_dir)/res',
-
-        '--R-dir', '<(intermediate_dir)/gen',
-
-        '--stamp', '<(codegen_stamp)',
+        '-DSTAMP=<(codegen_stamp)',
+        '-Dbasedir=.',
+        '-buildfile',
+        '<(DEPTH)/build/android/ant/apk-codegen.xml',
       ],
     },
     {
       'action_name': 'javac_<(_target_name)',
       'message': 'Compiling java for <(_target_name)',
       'variables': {
         'gen_src_dirs': [
           '<(intermediate_dir)/gen',
           '>@(generated_src_dirs)',
         ],
@@ skipping 235 matching lines @@
         '-DEMMA_INSTRUMENT=<(emma_instrument)',
         '-DEMMA_DEVICE_JAR=<(emma_device_jar)',
 
         '-Dbasedir=.',
         '-buildfile',
         '<(DEPTH)/build/android/ant/apk-package.xml',
       ]
     },
   ],
 }