Use java_apk.gypi for gtest apks

Use java_apk.gypi for gtest apks

Currently, normal APKs and instrumentation APKs are both built using
java_apk.gypi (which includes all kinds of new hotness). Native
unittest APKs, though use apk_test.gypi and thus the complicated
native_test_apk.xml and Android's Ant build.xml. That is bad.

This change updates apk_test.gypi to include java_apk.gypi and so
brings these two ways of building APKs into alignment. It also very
slightly updates the configurability of java_apk.gypi and
apk-package.xml.

There are still a couple of targets in WebKit that use
generate_native_test.py and native_test_apk.xml directly that need to
be updated to use apk_test.gypi before those two scripts can be
simplified/removed.

BUG=158821
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=192662

[shashi, 2013-04-04 22:41:45]

lgtm

https://codereview.chromium.org/13564003/diff/1/build/apk_test.gypi
File build/apk_test.gypi (right):

https://codereview.chromium.org/13564003/diff/1/build/apk_test.gypi#newcode61
build/apk_test.gypi:61: '<(android_manifest_path)',
So AndroidManifest was missing from outputs before.

[cjhopman, 2013-04-05 16:26:10]

nileshagrawal@ for committers/OWNERS

[nilesh, 2013-04-05 16:54:04]

LGTM

[commit-bot: I haz the power, 2013-04-05 17:03:04]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/cjhopman@chromium.org/13564003/4001

[commit-bot: I haz the power, 2013-04-05 19:38:21]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/cjhopman@chromium.org/13564003/19001

[commit-bot: I haz the power, 2013-04-05 20:59:48]

Retried try job too often on linux_chromeos for step(s) browser_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...

[commit-bot: I haz the power, 2013-04-05 21:05:36]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/cjhopman@chromium.org/13564003/19001

[commit-bot: I haz the power, 2013-04-05 21:05:37]

Failed to apply patch for build/java_apk.gypi:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file build/java_apk.gypi
  Hunk #2 succeeded at 97 with fuzz 2.
  Hunk #3 succeeded at 342 (offset 2 lines).
  Hunk #4 succeeded at 356 (offset 2 lines).
  Hunk #5 FAILED at 550.
  1 out of 5 hunks FAILED -- saving rejects to file build/java_apk.gypi.rej

Patch:       build/java_apk.gypi
Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index
33acb3474018c7b3cbdccbcb6e4ad830225c74cb..ba0108ec071503f01ddb5c97f53d53dd614c8e9d
100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -64,6 +64,7 @@
     'jar_name': 'chromium_apk_<(_target_name).jar',
     'resource_dir%':'<(DEPTH)/build/android/ant/empty/res',
     'R_package%':'',
+    'additional_R_text_files': [],
     'additional_res_dirs': [],
     'additional_res_packages': [],
     'is_test_apk%': 0,
@@ -96,11 +97,12 @@
     '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',
+    'android_manifest_path%': '<(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',
+    'final_apk_path%': '<(PRODUCT_DIR)/apks/<(apk_name).apk',
+    'source_dir': '<(java_in_dir)/src',
     'apk_install_stamp': '<(intermediate_dir)/apk_install.stamp',
   },
   # Pass the jar path to the apk's "fake" jar target.  This would be better as
@@ -338,7 +340,7 @@
         '<(DEPTH)/build/android/ant/apk-codegen.xml',
         '<(DEPTH)/build/android/gyp/util/build_utils.py',
         '<(DEPTH)/build/android/gyp/ant.py',
-        '<(android_manifest)',
+        '<(android_manifest_path)',
         '>@(library_manifest_paths)'
         '>@(codegen_input_paths)',
         '>@(additional_input_paths)',
@@ -352,7 +354,7 @@
         '-DADDITIONAL_RES_DIRS=>(additional_res_dirs)',
         '-DADDITIONAL_RES_PACKAGES=>(additional_res_packages)',
         '-DADDITIONAL_R_TEXT_FILES=>(additional_R_text_files)',
-        '-DANDROID_MANIFEST=<(android_manifest)',
+        '-DANDROID_MANIFEST=<(android_manifest_path)',
         '-DANDROID_SDK_JAR=<(android_sdk_jar)',
         '-DANDROID_SDK_ROOT=<(android_sdk_root)',
         '-DANDROID_SDK_VERSION=<(android_sdk_version)',
@@ -548,16 +550,16 @@
         '-DANDROID_SDK_JAR=<(android_sdk_jar)',
         '-DANDROID_SDK_ROOT=<(android_sdk_root)',
         '-DANDROID_SDK_VERSION=<(android_sdk_version)',
-        '-DAPKS_DIR=<(PRODUCT_DIR)/apks',
         '-DAPK_NAME=<(apk_name)',
         '-DAPP_MANIFEST_VERSION_CODE=<(app_manifest_version_code)',
         '-DAPP_MANIFEST_VERSION_NAME=<(app_manifest_version_name)',
         '-DASSET_DIR=<(asset_location)',
         '-DCONFIGURATION_NAME=<(CONFIGURATION_NAME)',
+        '-DFINAL_APK_PATH=<(final_apk_path)',
         '-DKEYSTORE_PATH=<(DEPTH)/build/android/ant/chromium-debug.keystore',
         '-DOUT_DIR=<(intermediate_dir)',
         '-DRESOURCE_DIR=<(resource_dir)',
-        '-DSOURCE_DIR=<(java_in_dir)/src',
+        '-DSOURCE_DIR=<(source_dir)',
 
         '-Dbasedir=.',
         '-buildfile',

[commit-bot: I haz the power, 2013-04-05 21:26:04]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/cjhopman@chromium.org/13564003/10003

[commit-bot: I haz the power, 2013-04-06 00:14:40]

Change committed as 192662