From d987e9b32712a738cb849d132812de0441ba3d07 Mon Sep 17 00:00:00 2001 From: Aditya Choudhary Date: Fri, 2 Feb 2024 14:02:09 +0000 Subject: [PATCH] Migrate Test Targets to New Android Ownership Model This CL is created as a best effort to migrate test targets to the new Android ownership model. It is based on historical data from repository history and insights from git blame. Given the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary attribution in this CL, please create a new CL to fix that. For detailed guidelines and further information on the migration please refer to the link below, go/new-android-ownership-model Bug: 304529413 Test: N/A Change-Id: Ia06fe7f4d0518d03cebf52d34ca9b1434011d272 --- identity/Android.bp | 7 +++--- identity/util/Android.bp | 1 + keystore/tests/Android.bp | 13 ++++++----- keystore/tests/fuzzer/Android.bp | 1 + ondevice-signing/tests/Android.bp | 39 ++++++++++++++++--------------- prng_seeder/Android.bp | 1 + provisioner/Android.bp | 3 ++- provisioner/support/Android.bp | 1 + 8 files changed, 37 insertions(+), 29 deletions(-) diff --git a/identity/Android.bp b/identity/Android.bp index f7a540af..6227bfe5 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 @@ cc_defaults { "-Wno-deprecated-declarations", ], sanitize: { - misc_undefined : ["integer"], + misc_undefined: ["integer"], }, } @@ -102,7 +103,7 @@ cc_library_static { name: "libcredstore_aidl", srcs: [ ":credstore_aidl", - ], + ], aidl: { export_aidl_headers: true, include_dirs: [ @@ -136,6 +137,6 @@ cc_fuzz { cc: [ "trong@google.com", "zeuthen@google.com", - ] + ], }, } diff --git a/identity/util/Android.bp b/identity/util/Android.bp index 71d77187..771fe792 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 e641f44b..c3a9e660 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 @@ cc_test { "libkeystore-attestation-application-id", "libvndksupport", ], - sanitize: { - cfi: false, - } + sanitize: { + cfi: false, + }, } cc_test { @@ -68,7 +69,7 @@ cc_test { 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 d459f75a..55d8f83e 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 40272200..bcfe8e40 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 @@ package { } 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 3c8179f0..4f9b7e14 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 605abb49..d0c934da 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 @@ cc_binary { "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 52b204f2..24cfd03c 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"