Revert 176198

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 147 matching lines @@
         '-DPRODUCT_DIR=<(ant_build_out)',
 
         '-DAPK_NAME=<(apk_name)',
         '-DASSET_DIR=<(asset_location)',
         '-DADDITIONAL_SRC_DIRS=>(additional_src_dirs)',
         '-DGENERATED_SRC_DIRS=>(generated_src_dirs)',
         '-DINPUT_JARS_PATHS=>(input_jars_paths)',
         '-DJAR_NAME=<(jar_name)',
         '-DPACKAGE_NAME=<(package_name)',
         '-DRESOURCE_DIR=<(resource_dir)',
+        '-DADDITIONAL_R_TEXT_FILES=>(additional_R_text_files)',
         '-DADDITIONAL_RES_DIRS=>(additional_res_dirs)',
         '-DADDITIONAL_RES_PACKAGES=>(additional_res_packages)',
         '-DAPP_MANIFEST_VERSION_NAME=<(app_manifest_version_name)',
         '-DAPP_MANIFEST_VERSION_CODE=<(app_manifest_version_code)',
         '-DPROGUARD_FLAGS=>(proguard_flags)',
         '-DPROGUARD_ENABLED=>(proguard_enabled)',
 
         '-Dbasedir=<(java_in_dir)',
         '-buildfile',
         '<(DEPTH)/build/android/ant/chromium-apk.xml',
 
         # Specify CONFIGURATION_NAME as the target for ant to build. The
         # buildfile will then build the appropriate SDK tools target.
         '<(CONFIGURATION_NAME)',
       ]
     },
   ],
   'conditions': [
     ['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'],
       },
     }],
   ],
 }