Merge "Use framework-res keep rules for system_server"

2023-05-20 04:13:57 +00:00
parent 4cc14c6dd4 6cf7fbde21
commit 61dae34432
1 changed files with 6 additions and 1 deletions
--- 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.