diff options
| author | 2023-05-20 05:40:57 +0000 | |
|---|---|---|
| committer | 2023-05-20 05:40:57 +0000 | |
| commit | 24d5a40029b097059f31e1c8a05f15cbe606c29c (patch) | |
| tree | c7c3015e6b7ffcf5b0ac7e3ad77f48cff92f15e6 | |
| parent | 6d9a6d0627b8726468c611eedf5a3f4e0bf58767 (diff) | |
| parent | 58fab586c83d17b4f7d5f1865c5b3a2f336be86c (diff) | |
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>
| -rw-r--r-- | services/Android.bp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/services/Android.bp b/services/Android.bp index b0a0e5e44a8c..7b64b4714017 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -58,7 +58,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}", + ], }, conditions_default: { optimize: { |