Merge "Snap for 11135399 from e5a22bf9e07a2fed525a6e7bd0fc57d79e85ff3a to simpleperf-release" into simpleperf-release
diff --git a/common/robolectric-native-prebuilt/resources/native/linux/x86_64/librobolectric-nativeruntime.so b/common/robolectric-native-prebuilt/resources/native/linux/x86_64/librobolectric-nativeruntime.so
index c548ac9..0d54be3 100644
--- a/common/robolectric-native-prebuilt/resources/native/linux/x86_64/librobolectric-nativeruntime.so
+++ b/common/robolectric-native-prebuilt/resources/native/linux/x86_64/librobolectric-nativeruntime.so
Binary files differ
diff --git a/protobuf_vendorcompat/Android.bp b/protobuf_vendorcompat/Android.bp
index f956418..47e7003 100644
--- a/protobuf_vendorcompat/Android.bp
+++ b/protobuf_vendorcompat/Android.bp
@@ -32,3 +32,27 @@
"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 c9861e3..6b15f5b 100644
--- a/protobuf_vendorcompat/arm/PREBUILT
+++ b/protobuf_vendorcompat/arm/PREBUILT
@@ -2,4 +2,5 @@
/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 0000000..04b851c
--- /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 170802e..96b2d06 100644
--- a/protobuf_vendorcompat/arm64/PREBUILT
+++ b/protobuf_vendorcompat/arm64/PREBUILT
@@ -2,4 +2,5 @@
/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 0000000..f327969
--- /dev/null
+++ b/protobuf_vendorcompat/arm64/libprotobuf-cpp-lite-3.9.1.so
Binary files differ
