Merge "Use framework-res keep rules for system_server" am: 61dae34432 am: 346994be6f am: 9860c43620
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2597189 Change-Id: I9fc7145a5e4c5b022b433b6cac9379d044f4973a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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: {
|
||||||
|
|||||||
Reference in New Issue
Block a user