Merge "Migrate Test Targets to New Android Ownership Model" into main am: cbae97c988 am: 0bd02381ce
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2945375
Change-Id: I4dcc759b514bc1d626b35c065e4451c1a37dfa94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/identity/Android.bp b/identity/Android.bp
index f7a540a..6227bfe 100644
--- a/identity/Android.bp
+++ b/identity/Android.bp
@@ -1,4 +1,5 @@
package {
+ default_team: "trendy_team_android_hardware_backed_security",
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "system_security_license"
@@ -17,7 +18,7 @@
"-Wno-deprecated-declarations",
],
sanitize: {
- misc_undefined : ["integer"],
+ misc_undefined: ["integer"],
},
}
@@ -102,7 +103,7 @@
name: "libcredstore_aidl",
srcs: [
":credstore_aidl",
- ],
+ ],
aidl: {
export_aidl_headers: true,
include_dirs: [
@@ -136,6 +137,6 @@
cc: [
"trong@google.com",
"zeuthen@google.com",
- ]
+ ],
},
}
diff --git a/identity/util/Android.bp b/identity/util/Android.bp
index 71d7718..771fe79 100644
--- a/identity/util/Android.bp
+++ b/identity/util/Android.bp
@@ -13,6 +13,7 @@
// limitations under the License.
package {
+ default_team: "trendy_team_android_hardware_backed_security",
default_applicable_licenses: ["Android-Apache-2.0"],
}
diff --git a/keystore/tests/Android.bp b/keystore/tests/Android.bp
index e641f44..c3a9e66 100644
--- a/keystore/tests/Android.bp
+++ b/keystore/tests/Android.bp
@@ -1,6 +1,7 @@
// Unit test for AuthTokenTable
package {
+ default_team: "trendy_team_android_hardware_backed_security",
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "system_security_license"
@@ -41,9 +42,9 @@
"libkeystore-attestation-application-id",
"libvndksupport",
],
- sanitize: {
- cfi: false,
- }
+ sanitize: {
+ cfi: false,
+ },
}
cc_test {
@@ -68,7 +69,7 @@
shared_libs: [
"libbinder_ndk",
],
- sanitize: {
- cfi: false,
- }
+ sanitize: {
+ cfi: false,
+ },
}
diff --git a/keystore/tests/fuzzer/Android.bp b/keystore/tests/fuzzer/Android.bp
index d459f75..55d8f83 100644
--- a/keystore/tests/fuzzer/Android.bp
+++ b/keystore/tests/fuzzer/Android.bp
@@ -15,6 +15,7 @@
*/
package {
+ default_team: "trendy_team_android_hardware_backed_security",
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "system_security_license"
diff --git a/ondevice-signing/tests/Android.bp b/ondevice-signing/tests/Android.bp
index 4027220..bcfe8e4 100644
--- a/ondevice-signing/tests/Android.bp
+++ b/ondevice-signing/tests/Android.bp
@@ -13,6 +13,7 @@
// limitations under the License.
package {
+ default_team: "trendy_team_art_mainline",
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "system_security_license"
@@ -22,23 +23,23 @@
}
cc_test {
- name: "libsigningutils_test",
- srcs: ["SigningUtilsTest.cpp"],
- test_suites: ["device-tests"],
- compile_multilib: "both",
- defaults: [
- "odsign_flags_defaults",
- ],
- static_libs: [
- "libsigningutils",
- ],
- shared_libs: [
- "libbase",
- "libcrypto",
- ],
- data: [
- "test_file",
- "test_file.sig",
- "SigningUtils.cert.der",
- ],
+ name: "libsigningutils_test",
+ srcs: ["SigningUtilsTest.cpp"],
+ test_suites: ["device-tests"],
+ compile_multilib: "both",
+ defaults: [
+ "odsign_flags_defaults",
+ ],
+ static_libs: [
+ "libsigningutils",
+ ],
+ shared_libs: [
+ "libbase",
+ "libcrypto",
+ ],
+ data: [
+ "test_file",
+ "test_file.sig",
+ "SigningUtils.cert.der",
+ ],
}
diff --git a/prng_seeder/Android.bp b/prng_seeder/Android.bp
index 3c8179f..4f9b7e1 100644
--- a/prng_seeder/Android.bp
+++ b/prng_seeder/Android.bp
@@ -13,6 +13,7 @@
// limitations under the License.
package {
+ default_team: "trendy_team_java_core_libraries",
// See: http://go/android-license-faq
// SPDX-license-identifier-Apache-2.0
default_applicable_licenses: ["system_security_license"],
diff --git a/provisioner/Android.bp b/provisioner/Android.bp
index 605abb4..d0c934d 100644
--- a/provisioner/Android.bp
+++ b/provisioner/Android.bp
@@ -15,6 +15,7 @@
//
package {
+ default_team: "trendy_team_foundation_security_rust_pkvm_",
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "system_security_license"
@@ -84,7 +85,7 @@
"dist_files",
"rkp_factory_extraction_tool",
],
- dest: "rkp_factory_extraction_tool"
+ dest: "rkp_factory_extraction_tool",
},
compile_multilib: "both",
multilib: {
diff --git a/provisioner/support/Android.bp b/provisioner/support/Android.bp
index 52b204f..24cfd03 100644
--- a/provisioner/support/Android.bp
+++ b/provisioner/support/Android.bp
@@ -13,6 +13,7 @@
// limitations under the License.
package {
+ default_team: "trendy_team_android_hardware_backed_security",
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "hardware_interfaces_license"