Merge "Remove unnecessary "_external" suffix from libcppbor" into main
diff --git a/Android.bp b/Android.bp
index 5b82c48..72f421a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,13 +14,13 @@
package {
default_team: "trendy_team_android_hardware_backed_security",
- default_applicable_licenses: ["external_libcppbor_license"],
+ default_applicable_licenses: ["libcppbor_license"],
}
// Added automatically by a large-scale-change
// See: http://go/android-license-faq
license {
- name: "external_libcppbor_license",
+ name: "libcppbor_license",
visibility: [":__subpackages__"],
license_kinds: [
"SPDX-license-identifier-Apache-2.0",
@@ -40,6 +40,31 @@
}
cc_library {
+ name: "libcppbor",
+ defaults: [
+ "libcppbor_defaults",
+ ],
+ vendor_available: true,
+ host_supported: true,
+ srcs: [
+ "src/cppbor.cpp",
+ "src/cppbor_parse.cpp",
+ ],
+ export_include_dirs: [
+ "include/cppbor",
+ ],
+ shared_libs: [
+ "libbase",
+ "libcrypto",
+ ],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
+}
+
+cc_library {
name: "libcppbor_external",
defaults: [
"libcppbor_defaults",
@@ -65,7 +90,7 @@
}
cc_test {
- name: "cppbor_test_external",
+ name: "cppbor_test",
defaults: [
"libcppbor_defaults",
],
@@ -73,7 +98,7 @@
"tests/cppbor_test.cpp",
],
shared_libs: [
- "libcppbor_external",
+ "libcppbor",
"libbase",
],
static_libs: [
@@ -83,7 +108,7 @@
}
cc_test_host {
- name: "cppbor_host_test_external",
+ name: "cppbor_host_test",
defaults: [
"libcppbor_defaults",
],
@@ -91,7 +116,7 @@
"tests/cppbor_test.cpp",
],
shared_libs: [
- "libcppbor_external",
+ "libcppbor",
"libbase",
],
static_libs: [