diff options
| author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-06 00:14:39 +0000 |
|---|---|---|
| committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-06 00:14:39 +0000 |
| commit | d82d769c83a7bfe28277dce0df3af4a70229b63d (patch) | |
| tree | 8406ff722a8c581f31ea6c1397d3a2b91b9e6e61 /build/android/ant | |
| parent | 44ed4bd710c9f7fa80be0413a460e99d366fecb2 (diff) | |
| download | chromium_src-d82d769c83a7bfe28277dce0df3af4a70229b63d.zip chromium_src-d82d769c83a7bfe28277dce0df3af4a70229b63d.tar.gz chromium_src-d82d769c83a7bfe28277dce0df3af4a70229b63d.tar.bz2 | |
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
Review URL: https://chromiumcodereview.appspot.com/13564003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/ant')
| -rw-r--r-- | build/android/ant/apk-package.xml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/build/android/ant/apk-package.xml b/build/android/ant/apk-package.xml index c01f0a2..51ceb02 100644 --- a/build/android/ant/apk-package.xml +++ b/build/android/ant/apk-package.xml @@ -46,9 +46,7 @@ <equals arg1="build.target" arg2="debug" /> </condition> - - <!-- Set the output directory for the final apk to the ${apks.dir}. --> - <property name="out.final.file" location="${APKS_DIR}/${APK_NAME}.apk" /> + <property name="out.final.file" location="${FINAL_APK_PATH}" /> <!-- Disables automatic signing. --> <property name="build.is.signing.debug" value="false"/> |