Merge "Migrate Test Targets to New Android Ownership Model" into main am: cbae97c988
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2945375 Change-Id: I36c59bd1f847852537f4f0b59400e02c41e53d2d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
0bd02381ce
8 changed files with 37 additions and 29 deletions
|
@ -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",
|
||||
]
|
||||
],
|
||||
},
|
||||
}
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
// limitations under the License.
|
||||
|
||||
package {
|
||||
default_team: "trendy_team_android_hardware_backed_security",
|
||||
default_applicable_licenses: ["Android-Apache-2.0"],
|
||||
}
|
||||
|
||||
|
|
|
@ -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,
|
||||
},
|
||||
}
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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",
|
||||
],
|
||||
}
|
||||
|
|
|
@ -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"],
|
||||
|
|
|
@ -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: {
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue