summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jay Sullivan <jaysullivan@google.com> 2023-11-20 23:20:00 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-11-20 23:20:00 +0000
commit4ab5669edd6ac0c92d1bfb808f39517d55787bf1 (patch)
treef135d1dff2dcd5db6223cbeca2d42cdcec719b0c
parentc9bcd9587894369522d4d3f6146ba08f458df5f9 (diff)
parent69e8f4cf23dc0b429e248d4f36310b425e70b924 (diff)
Merge "[Role Logic Move] Update proguard" into main
-rw-r--r--service/Android.bp4
-rw-r--r--service/proguard.flags4
2 files changed, 8 insertions, 0 deletions
diff --git a/service/Android.bp b/service/Android.bp
index c37cbe3f0..2e4442c15 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -139,6 +139,10 @@ java_sdk_library {
"com.android.role",
"com.android.safetycenter",
],
+ optimize: {
+ proguard_compatibility: false, // TODO(b/215530220): remove when this is default behavior
+ proguard_flags_files: ["proguard.flags"],
+ },
}
genrule {
diff --git a/service/proguard.flags b/service/proguard.flags
new file mode 100644
index 000000000..a504239a1
--- /dev/null
+++ b/service/proguard.flags
@@ -0,0 +1,4 @@
+# Keep classes that implements RoleBehavior, which are used by reflection.
+-keep class * implements com.android.role.controller.model.RoleBehavior {
+ *;
+} \ No newline at end of file