Merge "Use framework-res keep rules for system_server" am: 61dae34432 am: 346994be6f am: 9860c43620 am: 58fab586c8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2597189

Change-Id: I5897edd9362454d62209e39f073f98445546d821
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-20 05:40:57 +00:00
committed by Automerger Merge Worker

View File

@@ -58,7 +58,12 @@ system_optimized_java_defaults {
optimize: false, optimize: false,
shrink: true, shrink: true,
ignore_warnings: false, 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}",
],
}, },
conditions_default: { conditions_default: {
optimize: { optimize: {