From a49ee0238cbaf538cb3b625077b5dc18c93f8452 Mon Sep 17 00:00:00 2001
From: Shawn Willden <swillden@google.com>
Date: Thu, 28 Mar 2024 20:42:39 -0600
Subject: Remove unnecessary "_external" suffix from libcppbor

This CL adds a new version of the library without the suffix, a
future one will remove the old version, after all of the non-AOSP
dependencies are cleaned up.

Test: Build
Change-Id: Ib986e4c7d95fd1a0287f26563d44183cb432826b
---
 Android.bp | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

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",
@@ -39,6 +39,31 @@ cc_defaults {
     ],
 }
 
+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: [
@@ -65,7 +90,7 @@ cc_library {
 }
 
 cc_test {
-    name: "cppbor_test_external",
+    name: "cppbor_test",
     defaults: [
         "libcppbor_defaults",
     ],
@@ -73,7 +98,7 @@ cc_test {
         "tests/cppbor_test.cpp",
     ],
     shared_libs: [
-        "libcppbor_external",
+        "libcppbor",
         "libbase",
     ],
     static_libs: [
@@ -83,7 +108,7 @@ cc_test {
 }
 
 cc_test_host {
-    name: "cppbor_host_test_external",
+    name: "cppbor_host_test",
     defaults: [
         "libcppbor_defaults",
     ],
@@ -91,7 +116,7 @@ cc_test_host {
         "tests/cppbor_test.cpp",
     ],
     shared_libs: [
-        "libcppbor_external",
+        "libcppbor",
         "libbase",
     ],
     static_libs: [
-- 
cgit v1.2.3