Upstream: Enable proguard on WebApk.template.apk in release mode (issue 2054973002 by pkotwicz@chromium.org)

95 views
Skip to first unread message

pkot...@chromium.org

unread,
Jun 9, 2016, 4:51:39 PM6/9/16
to ha...@chromium.org, chromium...@chromium.org, jbudori...@chromium.org, mikecas...@chromium.org
Reviewers: Xi Han
CL: https://codereview.chromium.org/2054973002/

Message:
Xi can you please take a look?

I used the "Chrome proguard file" instead of making a "WebApk specific proguard
file" because the "Chrome proguard file" is well maintained.

Description:
Upstream: Enable proguard on WebApk.template.apk in release mode

BUG=609122

Base URL: https://chromium.googlesource.com/chromium/src.git@master

Affected files (+8, -2 lines):
M chrome/android/webapk/shell_apk/AndroidManifest.xml
M chrome/android/webapk/shell_apk/BUILD.gn


Index: chrome/android/webapk/shell_apk/AndroidManifest.xml
diff --git a/chrome/android/webapk/shell_apk/AndroidManifest.xml b/chrome/android/webapk/shell_apk/AndroidManifest.xml
index 68f9c309120cc13eaa76a5a6bac2996cf735ccef..4fd67d74a7dae20eb21515c37ba8e2eaf508ff2d 100644
--- a/chrome/android/webapk/shell_apk/AndroidManifest.xml
+++ b/chrome/android/webapk/shell_apk/AndroidManifest.xml
@@ -4,6 +4,7 @@
found in the LICENSE file.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
package="{{ manifest_package }}"
android:versionCode="1"
android:versionName="1.0" >
@@ -26,7 +27,7 @@
<action android:name="android.intent.action.VIEW"></action>
<category android:name="android.intent.category.DEFAULT"></category>
<category android:name="android.intent.category.BROWSABLE"></category>
- <data android:scheme="https" android:host="{{ scope_url_host }}" android:pathPrefix=""></data>
+ <data android:scheme="https" android:host="{{ scope_url_host }}" android:pathPrefix="/"></data>
</intent-filter>
</activity>
<meta-data android:name="runtimeHost" android:value="{{ runtime_host }}" />
@@ -34,7 +35,8 @@
<meta-data android:name="scope" android:value="{{ scope_url }}" />
<service
android:name="org.chromium.webapk.shell_apk.WebApkServiceFactory"
- android:exported="true">
+ android:exported="true"
+ tools:ignore="ExportedService">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.WEBAPK_API" />
Index: chrome/android/webapk/shell_apk/BUILD.gn
diff --git a/chrome/android/webapk/shell_apk/BUILD.gn b/chrome/android/webapk/shell_apk/BUILD.gn
index 3c9f4b26b77a3517dfa843cdc9f9dd5e102cfd12..285a1eb8025616e16acfde1d8718286a3b899668 100644
--- a/chrome/android/webapk/shell_apk/BUILD.gn
+++ b/chrome/android/webapk/shell_apk/BUILD.gn
@@ -66,6 +66,10 @@ android_apk("webapk") {
"//chrome/android/webapk/libs/common",
"//chrome/android/webapk/libs/runtime_library",
]
+ if (!is_debug) {
+ proguard_enabled = true
+ proguard_configs = [ "//chrome/android/java/proguard.flags" ]
+ }
}

android_library("shell_apk_javatests") {


ha...@chromium.org

unread,
Jun 10, 2016, 2:54:35 PM6/10/16
to pkot...@chromium.org, chromium...@chromium.org, jbudori...@chromium.org, mikecas...@chromium.org

android:scheme="https" android:host="{{ scope_url_host }}"
android:pathPrefix="/"></data>
Have you verified that this working?

https://codereview.chromium.org/2054973002/

pkot...@chromium.org

unread,
Jun 10, 2016, 4:16:02 PM6/10/16
to ha...@chromium.org, chromium...@chromium.org, jbudori...@chromium.org, mikecas...@chromium.org

https://codereview.chromium.org/2054973002/diff/20001/chrome/android/webapk/shell_apk/AndroidManifest.xml
File chrome/android/webapk/shell_apk/AndroidManifest.xml (right):

https://codereview.chromium.org/2054973002/diff/20001/chrome/android/webapk/shell_apk/AndroidManifest.xml#newcode30
chrome/android/webapk/shell_apk/AndroidManifest.xml:30: <data
android:scheme="https" android:host="{{ scope_url_host }}"
android:pathPrefix="/"></data>

ha...@chromium.org

unread,
Jun 10, 2016, 4:25:25 PM6/10/16
to pkot...@chromium.org, chromium...@chromium.org, jbudori...@chromium.org, mikecas...@chromium.org

commit-bot@chromium.org via codereview.chromium.org

unread,
Jun 10, 2016, 5:36:08 PM6/10/16
to pkot...@chromium.org, ha...@chromium.org, commi...@chromium.org, chromium...@chromium.org, jbudori...@chromium.org, mikecas...@chromium.org

commit-bot@chromium.org via codereview.chromium.org

unread,
Jun 10, 2016, 7:57:31 PM6/10/16
to pkot...@chromium.org, ha...@chromium.org, commi...@chromium.org, chromium...@chromium.org, jbudori...@chromium.org, mikecas...@chromium.org
Try jobs failed on following builders:
linux_chromium_asan_rel_ng on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_asan_rel_ng/builds/176204)

https://codereview.chromium.org/2054973002/

commit-bot@chromium.org via codereview.chromium.org

unread,
Jun 13, 2016, 10:35:36 AM6/13/16
to pkot...@chromium.org, ha...@chromium.org, commi...@chromium.org, chromium...@chromium.org, jbudori...@chromium.org, mikecas...@chromium.org

commit-bot@chromium.org via codereview.chromium.org

unread,
Jun 13, 2016, 11:22:41 AM6/13/16
to pkot...@chromium.org, ha...@chromium.org, commi...@chromium.org, chromium...@chromium.org, jbudori...@chromium.org, mikecas...@chromium.org
Committed patchset #1 (id:20001)

https://codereview.chromium.org/2054973002/

commit-bot@chromium.org via codereview.chromium.org

unread,
Jun 13, 2016, 11:24:28 AM6/13/16
to pkot...@chromium.org, ha...@chromium.org, commi...@chromium.org, chromium...@chromium.org, jbudori...@chromium.org, mikecas...@chromium.org
Patchset 1 (id:??) landed as
https://crrev.com/2c8b88ae551a1da6d9887626ca8729917fd9ae2f
Cr-Commit-Position: refs/heads/master@{#399450}

https://codereview.chromium.org/2054973002/
Reply all
Reply to author
Forward
0 new messages