Merge "Add config for FULL_SYSTEM_OPTIMIZE_JAVA" into main (55c8a818) · Commits · e / os / android_frameworks_base

services/Android.bp

+11 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,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"],
		}

		@@ -55,6 +58,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,
		@@ -78,6 +82,12 @@ system_optimized_java_defaults {
		},
		},
		},
		// Allow form factors to opt-in full system java optimization
		FULL_SYSTEM_OPTIMIZE_JAVA: {
		optimize: {
		optimize: true,
		},
		},
		},
		}

+5 −3

Original line number	Diff line number	Diff line
		@@ -50,6 +50,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 { *; }
		@@ -102,9 +107,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(...);