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

Commit 86d8bf59 authored Mar 29, 2024 by Treehugger Robot Committed by Gerrit Code Review Mar 29, 2024

Merge "Remove unnecessary "_external" suffix from libcppbor" into main

parents c523f768 98125926

identity/aidl/default/Android.bp

+3 −3

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ cc_library_static {
		],
		static_libs: [
		"libbase",
		"libcppbor_external",
		"libcppbor",
		"libcppcose_rkp",
		"libutils",
		"libsoft_attestation_cert",
		@@ -102,7 +102,7 @@ cc_binary {
		],
		static_libs: [
		"libbase",
		"libcppbor_external",
		"libcppbor",
		"libcppcose_rkp",
		"libutils",
		"libsoft_attestation_cert",
		@@ -146,7 +146,7 @@ cc_test {
		],
		static_libs: [
		"libbase",
		"libcppbor_external",
		"libcppbor",
		"libcppcose_rkp",
		"libutils",
		"libsoft_attestation_cert",

identity/aidl/vts/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ cc_test {
		"android.hardware.security.rkp-V3-cpp",
		"android.hardware.security.rkp-V3-ndk",
		"android.hardware.security.secureclock-V1-ndk",
		"libcppbor_external",
		"libcppbor",
		"libcppcose_rkp",
		"libkeymaster_portable",
		"libkeymint_vts_test_utils",

identity/support/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ cc_defaults {
		"libpuresoftkeymasterdevice",
		],
		static_libs: [
		"libcppbor_external",
		"libcppbor",
		],
		}

		@@ -70,7 +70,7 @@ cc_test {
		],
		static_libs: [
		"android.hardware.identity-support-lib",
		"libcppbor_external",
		"libcppbor",
		"libgmock",
		],
		test_suites: ["general-tests"],

security/keymint/aidl/default/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ cc_binary {
		"android.hardware.security.secureclock-V1-ndk",
		"libbase",
		"libbinder_ndk",
		"libcppbor_external",
		"libcppbor",
		"libcrypto",
		"libkeymaster_portable",
		"libkeymint",

security/keymint/aidl/vts/functional/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ cc_defaults {
		"android.hardware.security.secureclock-V1-ndk",
		"libavb_user",
		"libavb",
		"libcppbor_external",
		"libcppbor",
		"libcppcose_rkp",
		"libfs_mgr",
		"libjsoncpp",