From 770258c025fcd689895cac9d172a18609bf96d09 Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Tue, 24 Oct 2023 12:07:53 +0100
Subject: [PATCH] compat: Provide libprotobuf-cpp vendorcompat prebuilts from
 v29 VNDK

Android moved to a versioned approach in R and vendorcompat libs were
still possible to build, but not anymore with the Android U release.

Change-Id: Ibe06bf8d22ab0ce24ac5d5d9f3394b8593ee46cb
---
 Android.bp                             | 38 ++++++++++++++++++++++++++
 vndk/v29/arm/libprotobuf-cpp-full.so   |  1 +
 vndk/v29/arm/libprotobuf-cpp-lite.so   |  1 +
 vndk/v29/arm64/libprotobuf-cpp-full.so |  1 +
 vndk/v29/arm64/libprotobuf-cpp-lite.so |  1 +
 5 files changed, 42 insertions(+)
 create mode 120000 vndk/v29/arm/libprotobuf-cpp-full.so
 create mode 120000 vndk/v29/arm/libprotobuf-cpp-lite.so
 create mode 120000 vndk/v29/arm64/libprotobuf-cpp-full.so
 create mode 120000 vndk/v29/arm64/libprotobuf-cpp-lite.so

diff --git a/Android.bp b/Android.bp
index a8e7c10..7765306 100644
--- a/Android.bp
+++ b/Android.bp
@@ -422,3 +422,41 @@ cc_library_shared {
     compile_multilib: "64",
     vendor: true,
 }
+
+cc_prebuilt_library_shared {
+    name: "libprotobuf-cpp-full-vendorcompat",
+    stem: "libprotobuf-cpp-full",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: ["vndk/v29/arm/libprotobuf-cpp-full.so"],
+        },
+        android_arm64: {
+            srcs: ["vndk/v29/arm64/libprotobuf-cpp-full.so"],
+        },
+    },
+    compile_multilib: "both",
+    check_elf_files: false,
+}
+
+cc_prebuilt_library_shared {
+    name: "libprotobuf-cpp-lite-vendorcompat",
+    stem: "libprotobuf-cpp-lite",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: ["vndk/v29/arm/libprotobuf-cpp-lite.so"],
+        },
+        android_arm64: {
+            srcs: ["vndk/v29/arm64/libprotobuf-cpp-lite.so"],
+        },
+    },
+    compile_multilib: "both",
+    check_elf_files: false,
+}
diff --git a/vndk/v29/arm/libprotobuf-cpp-full.so b/vndk/v29/arm/libprotobuf-cpp-full.so
new file mode 120000
index 0000000..2c8c152
--- /dev/null
+++ b/vndk/v29/arm/libprotobuf-cpp-full.so
@@ -0,0 +1 @@
+../../../../../../prebuilts/vndk/v29/arm64/arch-arm-armv8-a/shared/vndk-core/libprotobuf-cpp-full.so
\ No newline at end of file
diff --git a/vndk/v29/arm/libprotobuf-cpp-lite.so b/vndk/v29/arm/libprotobuf-cpp-lite.so
new file mode 120000
index 0000000..4b3896e
--- /dev/null
+++ b/vndk/v29/arm/libprotobuf-cpp-lite.so
@@ -0,0 +1 @@
+../../../../../../prebuilts/vndk/v29/arm64/arch-arm-armv8-a/shared/vndk-core/libprotobuf-cpp-lite.so
\ No newline at end of file
diff --git a/vndk/v29/arm64/libprotobuf-cpp-full.so b/vndk/v29/arm64/libprotobuf-cpp-full.so
new file mode 120000
index 0000000..caba7cb
--- /dev/null
+++ b/vndk/v29/arm64/libprotobuf-cpp-full.so
@@ -0,0 +1 @@
+../../../../../../prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-core/libprotobuf-cpp-full.so
\ No newline at end of file
diff --git a/vndk/v29/arm64/libprotobuf-cpp-lite.so b/vndk/v29/arm64/libprotobuf-cpp-lite.so
new file mode 120000
index 0000000..a4bac2e
--- /dev/null
+++ b/vndk/v29/arm64/libprotobuf-cpp-lite.so
@@ -0,0 +1 @@
+../../../../../../prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-core/libprotobuf-cpp-lite.so
\ No newline at end of file