Merge "Use framework-res keep rules for system_server" am: 61dae34432 am: 346994be6f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2597189 Change-Id: I01479f4c3b4dc825fba159a291bf188227432946 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -59,7 +59,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}",
|
||||||
|
],
|
||||||
},
|
},
|
||||||
// Note: Optimizations are disabled by default if unspecified in
|
// Note: Optimizations are disabled by default if unspecified in
|
||||||
// the java_library rule.
|
// the java_library rule.
|
||||||
|
|||||||
Reference in New Issue
Block a user