summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2023-11-07 09:41:01 -0800
committerColin Cross <ccross@android.com>2023-11-07 09:44:03 -0800
commite50c7362efa1580324ad9e12eb73859ba98b0dbf (patch)
tree5efa841947ba37323f76f0cb434c5be17156aefd
parente4a83eafd4d08e8c2626185e2d0b47c1729d56a1 (diff)
downloadmisc-e50c7362efa1580324ad9e12eb73859ba98b0dbf.tar.gz
Add prebuilt of libprotobuf-cpp-lite-3.9.1.
Required by some of the Qualcomm prebuilt sensor binaries. Libraries were extracted from ab/9269995 for barbet-userdebug. Bug: 309393560 Test: treehugger Original-author: Bharath <bharath@fairphone.com> Co-authored-by: Prashantsinh <prashantsinh.parmar@fairphone.partners> Change-Id: I5f64c1f4db92c4fe68e52e6be85c0cc94c583248
-rw-r--r--protobuf_vendorcompat/Android.bp24
-rw-r--r--protobuf_vendorcompat/arm/PREBUILT3
-rw-r--r--protobuf_vendorcompat/arm/libprotobuf-cpp-lite-3.9.1.sobin0 -> 351072 bytes
-rw-r--r--protobuf_vendorcompat/arm64/PREBUILT3
-rw-r--r--protobuf_vendorcompat/arm64/libprotobuf-cpp-lite-3.9.1.sobin0 -> 498928 bytes
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
Binary files differ
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
Binary files differ