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

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

Merge "Treat R8 warnings as failures for system_server" am: 1f440e7a am:... 

Merge "Treat R8 warnings as failures for system_server" am: 1f440e7a am: df2014cb am: 62fadfaf

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



Change-Id: I0b4efd58a380853842ec33fb2b7eb33c280155d8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9857e5d1 62fadfaf

services/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ system_optimized_java_defaults { 
                // retracing infra.

                optimize: false,

                shrink: true,

                ignore_warnings: false,

                proguard_flags_files: ["proguard.flags"],

            },

            // Note: Optimizations are disabled by default if unspecified in
@@ -174,6 +175,8 @@ java_library { 
        "android.hidl.manager-V1.0-java",

        "framework-tethering.stubs.module_lib",

        "service-art.stubs.system_server",

        "service-permission.stubs.system_server",

        "service-sdksandbox.stubs.system_server",

    ],



    // Uncomment to enable output of certain warnings (deprecated, unchecked)

services/proguard.flags

+4 −0
Original line number Diff line number Diff line
@@ -118,3 +118,7 @@ 
-keep,allowoptimization,allowaccessmodification class com.android.server.usage.StorageStatsManagerLocal { *; }

-keep,allowoptimization,allowaccessmodification class com.android.internal.util.** { *; }

-keep,allowoptimization,allowaccessmodification class android.os.** { *; }



# CoverageService guards optional jacoco class references with a runtime guard, so we can safely

# suppress build-time warnings.

-dontwarn org.jacoco.agent.rt.*