summaryrefslogtreecommitdiffstats
path: root/build/java.gypi
diff options
context:
space:
mode:
authorcjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-05 16:51:32 +0000
committercjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-05 16:51:32 +0000
commit1a6a3bab26112198a86a5bdc1e742a7219877d90 (patch)
tree70edc23a3c24e75af1d225d9ad9eddb355785db0 /build/java.gypi
parent5af0d90d885fc081fdf837ea60d9cc0e32c993ee (diff)
downloadchromium_src-1a6a3bab26112198a86a5bdc1e742a7219877d90.zip
chromium_src-1a6a3bab26112198a86a5bdc1e742a7219877d90.tar.gz
chromium_src-1a6a3bab26112198a86a5bdc1e742a7219877d90.tar.bz2
Make apks build from a single ant .xml template
The ant build files for each of the apks that we create consisted of only fairly straightforward boilerplate. With the recent changes to java_apk.gypi and the gyp targets we can now build these correctly from a single .xml with the differences in how the targets are built being reflected in the gyp files (and then passed into ant). TBR=joth BUG=145991 Review URL: https://chromiumcodereview.appspot.com/10959034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160396 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/java.gypi')
-rw-r--r--build/java.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/java.gypi b/build/java.gypi
index 05e89c9..65cfe3d 100644
--- a/build/java.gypi
+++ b/build/java.gypi
@@ -18,7 +18,6 @@
#
# The generated jar-file will be:
# <(PRODUCT_DIR)/lib.java/chromium_<(package_name).jar
-#
# Required variables:
# package_name - Used to name the intermediate output directory and in the
# names of some output files.
@@ -67,6 +66,7 @@
],
'action': [
'ant',
+ '-DCONFIGURATION_NAME=<(CONFIGURATION_NAME)',
'-DANDROID_SDK=<(android_sdk)',
'-DANDROID_SDK_ROOT=<(android_sdk_root)',
'-DANDROID_SDK_TOOLS=<(android_sdk_tools)',