summaryrefslogtreecommitdiffstats
path: root/testing/android
diff options
context:
space:
mode:
authorcjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-11 02:53:44 +0000
committercjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-11 02:53:44 +0000
commitab729d1f26d0e3f3b86cdc0b771e76af3d8f1ad9 (patch)
treed3b3cc354c30d12acfa1b942e103bde1bc597ca4 /testing/android
parent8926a4aa4d463260dfedfd38282259dc51feea7d (diff)
downloadchromium_src-ab729d1f26d0e3f3b86cdc0b771e76af3d8f1ad9.zip
chromium_src-ab729d1f26d0e3f3b86cdc0b771e76af3d8f1ad9.tar.gz
chromium_src-ab729d1f26d0e3f3b86cdc0b771e76af3d8f1ad9.tar.bz2
Use checked in keystore to sign debug apks
keystore created with command: keytool -genkey -v -keystore chromium-debug.keystore -alias chromiumdebugkey -keyalg RSA -keysize 2048 -validity 36525 with password "chromium" and alias password "chromium". Android's SDK tools by default create a debug keystore in ~/.android. This has caused all kinds of grief. Instead, this change makes us use the new chrome-debug.keystore. BUG=145860 Review URL: https://chromiumcodereview.appspot.com/10918149 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing/android')
-rw-r--r--testing/android/native_test_apk.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/testing/android/native_test_apk.xml b/testing/android/native_test_apk.xml
index b410bc2..5e63cbc 100644
--- a/testing/android/native_test_apk.xml
+++ b/testing/android/native_test_apk.xml
@@ -19,7 +19,6 @@ found in the LICENSE file.
<property name="CHROMIUM_SRC" value="${PRODUCT_DIR}/../.." />
<import file="${CHROMIUM_SRC}/build/android/ant/common.xml"/>
- <import file="${CHROMIUM_SRC}/build/android/ant/sdk-targets.xml"/>
<!--
TODO(yfriedman): Remove the need to specify this. We should generate the packages in a way such
@@ -88,6 +87,7 @@ found in the LICENSE file.
</if>
</target>
+ <import file="${CHROMIUM_SRC}/build/android/ant/sdk-targets.xml"/>
<import file="${sdk.dir}/tools/ant/build.xml" />
</project>