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

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

Merge "AOSP platform_apis violations" into main am: dcda79b5 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2969671



Change-Id: I8e411a5390f9af312a4dd2f54abb04f41e5b5884
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7aebd209 dcda79b5

java/java.go

+171 −1
Original line number Diff line number Diff line
@@ -699,8 +699,178 @@ func setUncompressDex(ctx android.ModuleContext, dexpreopter *dexpreopter, dexer 
	}

}



func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) {

// list of java_library modules that set platform_apis: true

// this property is a no-op for java_library

// TODO (b/215379393): Remove this allowlist

var (

	aospPlatformApiAllowlist = map[string]bool{

		"adservices-test-scenarios":                         true,

		"aidl-cpp-java-test-interface-java":                 true,

		"aidl-test-extras-java":                             true,

		"aidl-test-interface-java":                          true,

		"aidl-test-interface-permission-java":               true,

		"aidl_test_java_client_permission":                  true,

		"aidl_test_java_client_sdk1":                        true,

		"aidl_test_java_client_sdk29":                       true,

		"aidl_test_java_client":                             true,

		"aidl_test_java_service_permission":                 true,

		"aidl_test_java_service_sdk1":                       true,

		"aidl_test_java_service_sdk29":                      true,

		"aidl_test_java_service":                            true,

		"aidl_test_loggable_interface-java":                 true,

		"aidl_test_nonvintf_parcelable-V1-java":             true,

		"aidl_test_nonvintf_parcelable-V2-java":             true,

		"aidl_test_unstable_parcelable-java":                true,

		"aidl_test_vintf_parcelable-V1-java":                true,

		"aidl_test_vintf_parcelable-V2-java":                true,

		"android.aidl.test.trunk-V1-java":                   true,

		"android.aidl.test.trunk-V2-java":                   true,

		"android.frameworks.location.altitude-V1-java":      true,

		"android.frameworks.location.altitude-V2-java":      true,

		"android.frameworks.stats-V1-java":                  true,

		"android.frameworks.stats-V2-java":                  true,

		"android.frameworks.stats-V3-java":                  true,

		"android.hardware.authsecret-V1-java":               true,

		"android.hardware.authsecret-V2-java":               true,

		"android.hardware.biometrics.common-V1-java":        true,

		"android.hardware.biometrics.common-V2-java":        true,

		"android.hardware.biometrics.common-V3-java":        true,

		"android.hardware.biometrics.common-V4-java":        true,

		"android.hardware.biometrics.face-V1-java":          true,

		"android.hardware.biometrics.face-V2-java":          true,

		"android.hardware.biometrics.face-V3-java":          true,

		"android.hardware.biometrics.face-V4-java":          true,

		"android.hardware.biometrics.fingerprint-V1-java":   true,

		"android.hardware.biometrics.fingerprint-V2-java":   true,

		"android.hardware.biometrics.fingerprint-V3-java":   true,

		"android.hardware.biometrics.fingerprint-V4-java":   true,

		"android.hardware.bluetooth.lmp_event-V1-java":      true,

		"android.hardware.confirmationui-V1-java":           true,

		"android.hardware.confirmationui-V2-java":           true,

		"android.hardware.gatekeeper-V1-java":               true,

		"android.hardware.gatekeeper-V2-java":               true,

		"android.hardware.gnss-V1-java":                     true,

		"android.hardware.gnss-V2-java":                     true,

		"android.hardware.gnss-V3-java":                     true,

		"android.hardware.gnss-V4-java":                     true,

		"android.hardware.graphics.common-V1-java":          true,

		"android.hardware.graphics.common-V2-java":          true,

		"android.hardware.graphics.common-V3-java":          true,

		"android.hardware.graphics.common-V4-java":          true,

		"android.hardware.graphics.common-V5-java":          true,

		"android.hardware.identity-V1-java":                 true,

		"android.hardware.identity-V2-java":                 true,

		"android.hardware.identity-V3-java":                 true,

		"android.hardware.identity-V4-java":                 true,

		"android.hardware.identity-V5-java":                 true,

		"android.hardware.identity-V6-java":                 true,

		"android.hardware.keymaster-V1-java":                true,

		"android.hardware.keymaster-V2-java":                true,

		"android.hardware.keymaster-V3-java":                true,

		"android.hardware.keymaster-V4-java":                true,

		"android.hardware.keymaster-V5-java":                true,

		"android.hardware.oemlock-V1-java":                  true,

		"android.hardware.oemlock-V2-java":                  true,

		"android.hardware.power.stats-V1-java":              true,

		"android.hardware.power.stats-V2-java":              true,

		"android.hardware.power.stats-V3-java":              true,

		"android.hardware.power-V1-java":                    true,

		"android.hardware.power-V2-java":                    true,

		"android.hardware.power-V3-java":                    true,

		"android.hardware.power-V4-java":                    true,

		"android.hardware.power-V5-java":                    true,

		"android.hardware.rebootescrow-V1-java":             true,

		"android.hardware.rebootescrow-V2-java":             true,

		"android.hardware.security.authgraph-V1-java":       true,

		"android.hardware.security.keymint-V1-java":         true,

		"android.hardware.security.keymint-V2-java":         true,

		"android.hardware.security.keymint-V3-java":         true,

		"android.hardware.security.keymint-V4-java":         true,

		"android.hardware.security.secureclock-V1-java":     true,

		"android.hardware.security.secureclock-V2-java":     true,

		"android.hardware.thermal-V1-java":                  true,

		"android.hardware.thermal-V2-java":                  true,

		"android.hardware.threadnetwork-V1-java":            true,

		"android.hardware.weaver-V1-java":                   true,

		"android.hardware.weaver-V2-java":                   true,

		"android.hardware.weaver-V3-java":                   true,

		"android.security.attestationmanager-java":          true,

		"android.security.authorization-java":               true,

		"android.security.compat-java":                      true,

		"android.security.legacykeystore-java":              true,

		"android.security.maintenance-java":                 true,

		"android.security.metrics-java":                     true,

		"android.system.keystore2-V1-java":                  true,

		"android.system.keystore2-V2-java":                  true,

		"android.system.keystore2-V3-java":                  true,

		"android.system.keystore2-V4-java":                  true,

		"binderReadParcelIface-java":                        true,

		"binderRecordReplayTestIface-java":                  true,

		"car-experimental-api-static-lib":                   true,

		"collector-device-lib-platform":                     true,

		"com.android.car.oem":                               true,

		"com.google.hardware.pixel.display-V10-java":        true,

		"com.google.hardware.pixel.display-V1-java":         true,

		"com.google.hardware.pixel.display-V2-java":         true,

		"com.google.hardware.pixel.display-V3-java":         true,

		"com.google.hardware.pixel.display-V4-java":         true,

		"com.google.hardware.pixel.display-V5-java":         true,

		"com.google.hardware.pixel.display-V6-java":         true,

		"com.google.hardware.pixel.display-V7-java":         true,

		"com.google.hardware.pixel.display-V8-java":         true,

		"com.google.hardware.pixel.display-V9-java":         true,

		"conscrypt-support":                                 true,

		"cts-keystore-test-util":                            true,

		"cts-keystore-user-auth-helper-library":             true,

		"ctsmediautil":                                      true,

		"CtsNetTestsNonUpdatableLib":                        true,

		"DpmWrapper":                                        true,

		"flickerlib-apphelpers":                             true,

		"flickerlib-helpers":                                true,

		"flickerlib-parsers":                                true,

		"flickerlib":                                        true,

		"hardware.google.bluetooth.ccc-V1-java":             true,

		"hardware.google.bluetooth.sar-V1-java":             true,

		"monet":                                             true,

		"pixel-power-ext-V1-java":                           true,

		"pixel-power-ext-V2-java":                           true,

		"pixel_stateresidency_provider_aidl_interface-java": true,

		"pixel-thermal-ext-V1-java":                         true,

		"protolog-lib":                                      true,

		"RkpRegistrationCheck":                              true,

		"rotary-service-javastream-protos":                  true,

		"service_based_camera_extensions":                   true,

		"statsd-helper-test":                                true,

		"statsd-helper":                                     true,

		"test-piece-2-V1-java":                              true,

		"test-piece-2-V2-java":                              true,

		"test-piece-3-V1-java":                              true,

		"test-piece-3-V2-java":                              true,

		"test-piece-3-V3-java":                              true,

		"test-piece-4-V1-java":                              true,

		"test-piece-4-V2-java":                              true,

		"test-root-package-V1-java":                         true,

		"test-root-package-V2-java":                         true,

		"test-root-package-V3-java":                         true,

		"test-root-package-V4-java":                         true,

		"testServiceIface-java":                             true,

		"wm-flicker-common-app-helpers":                     true,

		"wm-flicker-common-assertions":                      true,

		"wm-shell-flicker-utils":                            true,

		"wycheproof-keystore":                               true,

	}



	// Union of aosp and internal allowlists

	PlatformApiAllowlist = map[string]bool{}

)



func init() {

	for k, v := range aospPlatformApiAllowlist {

		PlatformApiAllowlist[k] = v

	}

}



func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) {

	j.provideHiddenAPIPropertyInfo(ctx)



	j.sdkVersion = j.SdkVersion(ctx)