Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d151fc02 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use framework-res keep rules for system_server" am: 61dae344 am:... 

Merge "Use framework-res keep rules for system_server" am: 61dae344 am: 346994be am: 9860c436 am: 58fab586 am: 24d5a400

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



Change-Id: I8a1740f563934f45ff9f36cbd0746c72dbf383cd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 76ce8660 24d5a400

services/Android.bp

+6 −1
Original line number Diff line number Diff line
@@ -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: {