Make apks build from a single ant .xml template

build/java_apk.gypi

Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index a368bfc822921991bfa76d9b41e8dc5c1c3e916d..329a34ac8093c4b895cee6269763a07c75f23713 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -33,14 +33,15 @@
     'native_libs_paths': [],
     'additional_src_dirs': [],
     'additional_input_paths': [],
+    'asset_location': '',
   },
   'actions': [
     {
       'action_name': 'ant_<(package_name)_apk',
       'message': 'Building <(package_name) apk.',
       'inputs': [
-        '<(java_in_dir)/<(package_name)_apk.xml',
         '<(java_in_dir)/AndroidManifest.xml',
+        '<(DEPTH)/build/android/ant/chromium-apk.xml',
         '<(DEPTH)/build/android/ant/common.xml',
         '<(DEPTH)/build/android/ant/sdk-targets.xml',
         '<!@(find <(java_in_dir) -name "*.java")',
@@ -54,7 +55,6 @@
       ],
       'action': [
         'ant',
-        '-DPRODUCT_DIR=<(ant_build_out)',
         '-DAPP_ABI=<(android_app_abi)',
         '-DANDROID_GDBSERVER=<(android_gdbserver)',
         '-DANDROID_SDK=<(android_sdk)',
@@ -62,14 +62,21 @@
         '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
         '-DANDROID_SDK_VERSION=<(android_sdk_version)',
         '-DANDROID_TOOLCHAIN=<(android_toolchain)',
-        '-DPACKAGE_NAME=<(package_name)',
+        '-DCHROMIUM_SRC=<(ant_build_out)/../..',
         '-DCONFIGURATION_NAME=<(CONFIGURATION_NAME)',
-        '-DINPUT_JARS_PATHS=>(input_jars_paths)',
+        '-DPRODUCT_DIR=<(ant_build_out)',
+
         '-DADDITIONAL_SRC_DIRS=>(additional_src_dirs)',
-        '-DCHROMIUM_SRC=<(ant_build_out)/../..',
+        '-Dbasedir=<(java_in_dir)',
+        '-DINPUT_JARS_PATHS=>(input_jars_paths)',
+        '-DPACKAGE_NAME=<(package_name)',
+
+        '-DAPK_NAME=<(apk_name)',
+        '-DASSET_DIR=<(asset_location)',
         '-DRESOURCE_DIR=<(resource_dir)',
+
         '-buildfile',
-        '<(java_in_dir)/<(package_name)_apk.xml'
+        '<(DEPTH)/build/android/ant/chromium-apk.xml'
       ]
     },
   ],