Merge "Add prebuilt of libprotobuf-cpp-lite-3.9.1." into main am: 712686a538

Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2817457

Change-Id: I799376a475dffa2101cbc0354465d9e56c298e0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5 files changed, 28 insertions, 2 deletions

diff --git a/protobuf_vendorcompat/Android.bp b/protobuf_vendorcompat/Android.bp
index f9564189..47e70033 100644
--- a/protobuf_vendorcompat/Android.bp
+++ b/protobuf_vendorcompat/Android.bp
@@ -32,3 +32,27 @@ cc_prebuilt_library_shared {
         "libz",
     ],
 }
+
+// Workaround for Qualcomm prebuilts used by partners.
+cc_prebuilt_library_shared {
+    name: "libprotobuf-cpp-lite-3.9.1-vendorcompat",
+    stem: "libprotobuf-cpp-lite-3.9.1",
+    vendor: true,
+    target: {
+        android_arm64: {
+            srcs: ["arm64/libprotobuf-cpp-lite-3.9.1.so"],
+        },
+        android_arm: {
+            srcs: ["arm/libprotobuf-cpp-lite-3.9.1.so"],
+        },
+    },
+
+    shared_libs: [
+        "libc++",
+        "libc",
+        "libdl",
+        "liblog",
+        "libm",
+        "libz",
+    ],
+}
diff --git a/protobuf_vendorcompat/arm/PREBUILT b/protobuf_vendorcompat/arm/PREBUILT
index c9861e3a..6b15f5b7 100644
--- a/protobuf_vendorcompat/arm/PREBUILT
+++ b/protobuf_vendorcompat/arm/PREBUILT
@@ -2,4 +2,5 @@ Extracted from ab/9269995, target barbet-userdebug as follows:
 
 /google/data/ro/projects/android/fetch_artifact --bid 9269995 --target barbet-userdebug 'barbet-img-9269995.zip'
 unzip barbet-img-9269995.zip vendor.img
-e2cp vendor.img:lib/libprotobuf-cpp-full-3.9.1.so $ANDROID_BUILD_TOP/prebuilts/misc/android-arm/protobuf/
\ No newline at end of file
+e2cp vendor.img:lib/libprotobuf-cpp-full-3.9.1.so $ANDROID_BUILD_TOP/prebuilts/misc/protobuf_vendorcompat/arm/
+e2cp vendor.img:lib/libprotobuf-cpp-lite-3.9.1.so $ANDROID_BUILD_TOP/prebuilts/misc/protobuf_vendorcompat/arm/
diff --git a/protobuf_vendorcompat/arm/libprotobuf-cpp-lite-3.9.1.so b/protobuf_vendorcompat/arm/libprotobuf-cpp-lite-3.9.1.so
new file mode 100644
index 00000000..04b851c4
--- /dev/null
+++ b/protobuf_vendorcompat/arm/libprotobuf-cpp-lite-3.9.1.so
diff --git a/protobuf_vendorcompat/arm64/PREBUILT b/protobuf_vendorcompat/arm64/PREBUILT
index 170802eb..96b2d06e 100644
--- a/protobuf_vendorcompat/arm64/PREBUILT
+++ b/protobuf_vendorcompat/arm64/PREBUILT
@@ -2,4 +2,5 @@ Extracted from ab/9269995, target barbet-userdebug as follows:
 
 /google/data/ro/projects/android/fetch_artifact --bid 9269995 --target barbet-userdebug 'barbet-img-9269995.zip'
 unzip barbet-img-9269995.zip vendor.img
-e2cp vendor.img:lib64/libprotobuf-cpp-full-3.9.1.so $ANDROID_BUILD_TOP/prebuilts/misc/android-arm64/protobuf/
\ No newline at end of file
+e2cp vendor.img:lib64/libprotobuf-cpp-full-3.9.1.so $ANDROID_BUILD_TOP/prebuilts/misc/protobuf_vendorcompat/arm64/
+e2cp vendor.img:lib64/libprotobuf-cpp-lite-3.9.1.so $ANDROID_BUILD_TOP/prebuilts/misc/protobuf_vendorcompat/arm64/
diff --git a/protobuf_vendorcompat/arm64/libprotobuf-cpp-lite-3.9.1.so b/protobuf_vendorcompat/arm64/libprotobuf-cpp-lite-3.9.1.so
new file mode 100644
index 00000000..f3279692
--- /dev/null
+++ b/protobuf_vendorcompat/arm64/libprotobuf-cpp-lite-3.9.1.so