diff options
| author |  djsollen <djsollen@google.com> | 2015-08-10 08:58:03 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-10 08:58:04 -0700 |
| commit | 3a26fc8e9a31e51125c494e1f8605f101ca71d2b (patch) | |
| tree | 434dd46250d2fbbb488f097449f922d81ad5df5e /platform_tools | |
| parent | 4f2b33159b5a5da869ed605abf1d73b5cd429934 (diff) | |
Ensure that android "release" apps are signed with debug key
Review URL: https://codereview.chromium.org/1275223003
Diffstat (limited to 'platform_tools')
| -rw-r--r-- | platform_tools/android/apps/sample_app/build.gradle | 1 | ||||
| -rwxr-xr-x | platform_tools/android/bin/android_install_app | 2 | ||||
| -rw-r--r-- | platform_tools/android/gyp/skia_android.gypi | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/platform_tools/android/apps/sample_app/build.gradle b/platform_tools/android/apps/sample_app/build.gradle index e2986e09a4..def446a382 100644 --- a/platform_tools/android/apps/sample_app/build.gradle +++ b/platform_tools/android/apps/sample_app/build.gradle @@ -10,6 +10,7 @@ android { targetSdkVersion 19 versionCode 1 versionName "1.0" + signingConfig signingConfigs.debug } sourceSets.main.jni.srcDirs = [] //disable automatic ndk-build call diff --git a/platform_tools/android/bin/android_install_app b/platform_tools/android/bin/android_install_app index 83b879f444..01a792e9f9 100755 --- a/platform_tools/android/bin/android_install_app +++ b/platform_tools/android/bin/android_install_app @@ -56,7 +56,7 @@ fi if [[ "$BUILDTYPE" == "Release" ]]; then - apk_suffix="release-unsigned.apk" + apk_suffix="release.apk" else apk_suffix="debug.apk" fi diff --git a/platform_tools/android/gyp/skia_android.gypi b/platform_tools/android/gyp/skia_android.gypi index 4e32fcbf7d..47dbf7ac8c 100644 --- a/platform_tools/android/gyp/skia_android.gypi +++ b/platform_tools/android/gyp/skia_android.gypi @@ -39,7 +39,7 @@ 'android_variant%': "mips64", }], [ 'android_buildtype == "Release"', { - 'android_apk_suffix': "release-unsigned.apk", + 'android_apk_suffix': "release.apk", }, { 'android_apk_suffix': "debug.apk", }], |