summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/Android.bp7
1 files changed, 6 insertions, 1 deletions
diff --git a/services/Android.bp b/services/Android.bp
index 1750b6731888..eb56c250e224 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -59,7 +59,12 @@ system_optimized_java_defaults {
optimize: false,
shrink: true,
ignore_warnings: false,
- proguard_flags_files: ["proguard.flags"],
+ proguard_flags_files: [
+ "proguard.flags",
+ // Ensure classes referenced in the framework-res manifest
+ // and implemented in system_server are kept.
+ ":framework-res{.aapt.proguardOptionsFile}",
+ ],
},
// Note: Optimizations are disabled by default if unspecified in
// the java_library rule.