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

Commit 01cd6f8a authored by Timothy Yiu's avatar Timothy Yiu Committed by Android (Google) Code Review
Browse files

Merge "Add config for FULL_SYSTEM_OPTIMIZE_JAVA" into main

parents 1761fcf9 39a05ed3

services/Android.bp

+11 −1
Original line number Diff line number Diff line
@@ -41,7 +41,10 @@ soong_config_module_type { 
    name: "system_optimized_java_defaults",

    module_type: "java_defaults",

    config_namespace: "ANDROID",

    bool_variables: ["SYSTEM_OPTIMIZE_JAVA"],

    bool_variables: [

        "SYSTEM_OPTIMIZE_JAVA",

        "FULL_SYSTEM_OPTIMIZE_JAVA",

    ],

    properties: [

        "optimize",

        "dxflags",
@@ -56,6 +59,7 @@ system_optimized_java_defaults { 
                enabled: true,

                // TODO(b/210510433): Enable optimizations after improving

                // retracing infra.

                // See also FULL_SYSTEM_OPTIMIZE_JAVA.

                optimize: false,

                shrink: true,

                ignore_warnings: false,
@@ -81,6 +85,12 @@ system_optimized_java_defaults { 
                dxflags: ["--debug"],

            },

        },

        // Allow form factors to opt-in full system java optimization

        FULL_SYSTEM_OPTIMIZE_JAVA: {

            optimize: {

                optimize: true,

            },

        },

    },

}

services/proguard.flags

+5 −3
Original line number Diff line number Diff line
@@ -47,6 +47,11 @@ 
-keep,allowoptimization,allowaccessmodification class com.android.net.module.util.* { *; }

-keep,allowoptimization,allowaccessmodification public class com.android.server.net.IpConfigStore { *; }

-keep,allowoptimization,allowaccessmodification public class com.android.server.net.BaseNetworkObserver { *; }

-keep,allowoptimization,allowaccessmodification class com.android.server.display.feature.DisplayManagerFlags { *; }

-keep,allowoptimization,allowaccessmodification class android.app.admin.flags.FeatureFlagsImpl { *; }

-keep,allowoptimization,allowaccessmodification class com.android.server.input.NativeInputManagerService$NativeImpl { *; }

-keep,allowoptimization,allowaccessmodification class com.android.server.ThreadPriorityBooster { *; }

-keep,allowaccessmodification class android.app.admin.flags.Flags { *; }



# Referenced via CarServiceHelperService in car-frameworks-service (avoid removing)

-keep public class com.android.server.utils.Slogf { *; }
@@ -99,9 +104,6 @@ 
-keep,allowoptimization,allowaccessmodification class com.android.server.input.InputManagerService {

  <methods>;

}

-keep,allowoptimization,allowaccessmodification class com.android.server.input.NativeInputManagerService$NativeImpl {

  <methods>;

}

-keep,allowoptimization,allowaccessmodification class com.android.server.usb.UsbHostManager {

  *** usbDeviceRemoved(...);

  *** usbDeviceAdded(...);