[automerger skipped] Merge SPL-2020-03-05 Change-Id: Icd8f216105da91329f832d609439d12b90acab0e skipped: 4cc857ddeb
Change-Id: I645b0a66544e0aa4adbe2b6593757b78796e73c0
diff --git a/Android.bp b/Android.bp
index 45afb6f..b83f2b1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,3 +37,114 @@
},
}
+prebuilt_etc {
+ name: "vndkcore.libraries.28.txt",
+ target: {
+ android_arm64: {
+ src: "arm64/configs/vndkcore.libraries.28.txt",
+ },
+ android_arm: {
+ src: "arm/configs/vndkcore.libraries.28.txt",
+ },
+ android_x86_64: {
+ src: "x86_64/configs/vndkcore.libraries.28.txt",
+ },
+ android_x86: {
+ src: "x86/configs/vndkcore.libraries.28.txt",
+ },
+ },
+}
+
+prebuilt_etc {
+ name: "vndkprivate.libraries.28.txt",
+ target: {
+ android_arm64: {
+ src: "arm64/configs/vndkprivate.libraries.28.txt",
+ },
+ android_arm: {
+ src: "arm/configs/vndkprivate.libraries.28.txt",
+ },
+ android_x86_64: {
+ src: "x86_64/configs/vndkprivate.libraries.28.txt",
+ },
+ android_x86: {
+ src: "x86/configs/vndkprivate.libraries.28.txt",
+ },
+ },
+}
+
+// Some vendor prebuilts reference libprotobuf-cpp-lite.so and
+// libprotobuf-cpp-full.so and expect the 3.0.0-beta3 version.
+// The new version of protobuf will be installed as
+// /vendor/lib64/libprotobuf-cpp-lite-3.9.1.so. The VNDK doesn't
+// help here because we compile old devices against master and not
+// an old VNDK snapshot. We need to continue to provide a vendor
+// libprotobuf-cpp-lite.so until all products in master get updated
+// prebuilts or are obsoleted.
+
+// TODO(b/142220143): should these modules get moved somewhere else?
+cc_prebuilt_library_shared {
+ name: "libprotobuf-cpp-lite-vendorcompat",
+ stem: "libprotobuf-cpp-lite",
+ vendor: true,
+ // These are already stripped, and restripping them just issues diagnostics.
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: ["arm64/arch-arm64-armv8-a/shared/vndk-core/libprotobuf-cpp-lite.so"],
+ },
+ android_arm: {
+ srcs: ["arm/arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-lite.so"],
+ },
+ android_x86_64: {
+ srcs: ["x86_64/arch-x86_64-x86_64/shared/vndk-core/libprotobuf-cpp-lite.so"],
+ },
+ android_x86: {
+ srcs: ["x86/arch-x86-x86/shared/vndk-core/libprotobuf-cpp-lite.so"],
+ },
+ },
+
+ shared_libs: [
+ "libc++",
+ "libc",
+ "libdl",
+ "liblog",
+ "libm",
+ "libz",
+ ],
+}
+
+cc_prebuilt_library_shared {
+ name: "libprotobuf-cpp-full-vendorcompat",
+ stem: "libprotobuf-cpp-full",
+ vendor: true,
+ // These are already stripped, and restripping them just issues diagnostics.
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: ["arm64/arch-arm64-armv8-a/shared/vndk-core/libprotobuf-cpp-full.so"],
+ },
+ android_arm: {
+ srcs: ["arm/arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-full.so"],
+ },
+ android_x86_64: {
+ srcs: ["x86_64/arch-x86_64-x86_64/shared/vndk-core/libprotobuf-cpp-full.so"],
+ },
+ android_x86: {
+ srcs: ["x86/arch-x86-x86/shared/vndk-core/libprotobuf-cpp-full.so"],
+ },
+ },
+
+ shared_libs: [
+ "libc++",
+ "libc",
+ "libdl",
+ "liblog",
+ "libm",
+ "libz",
+ ],
+}
diff --git a/arm/Android.bp b/arm/Android.bp
index de63073..cfe21e7 100644
--- a/arm/Android.bp
+++ b/arm/Android.bp
@@ -237,6 +237,8 @@
"ld.config.28.txt",
"llndk.libraries.28.txt",
"vndksp.libraries.28.txt",
+ "vndkcore.libraries.28.txt",
+ "vndkprivate.libraries.28.txt",
],
}
@@ -3403,9 +3405,9 @@
enabled: true,
support_system_process: true,
},
- relative_install_path: "hw",
arch: {
arm: {
+ relative_install_path: "hw",
srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
},
},
diff --git a/arm/binder32/Android.bp b/arm/binder32/Android.bp
index 500b5f3..a857fb7 100644
--- a/arm/binder32/Android.bp
+++ b/arm/binder32/Android.bp
@@ -237,6 +237,8 @@
"ld.config.28.txt",
"llndk.libraries.28.txt",
"vndksp.libraries.28.txt",
+ "vndkcore.libraries.28.txt",
+ "vndkprivate.libraries.28.txt",
],
}
@@ -3610,9 +3612,9 @@
enabled: true,
support_system_process: true,
},
- relative_install_path: "hw",
arch: {
arm: {
+ relative_install_path: "hw",
srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
},
},
diff --git a/arm/configs/vndkcore.libraries.txt b/arm/configs/vndkcore.libraries.28.txt
similarity index 100%
rename from arm/configs/vndkcore.libraries.txt
rename to arm/configs/vndkcore.libraries.28.txt
diff --git a/arm/configs/vndkprivate.libraries.txt b/arm/configs/vndkprivate.libraries.28.txt
similarity index 100%
rename from arm/configs/vndkprivate.libraries.txt
rename to arm/configs/vndkprivate.libraries.28.txt
diff --git a/arm64/Android.bp b/arm64/Android.bp
index 2ad0cd9..3e5969b 100644
--- a/arm64/Android.bp
+++ b/arm64/Android.bp
@@ -238,6 +238,8 @@
"ld.config.28.txt",
"llndk.libraries.28.txt",
"vndksp.libraries.28.txt",
+ "vndkcore.libraries.28.txt",
+ "vndkprivate.libraries.28.txt",
],
}
@@ -3971,12 +3973,13 @@
enabled: true,
support_system_process: true,
},
- relative_install_path: "hw",
arch: {
arm: {
+ relative_install_path: "hw",
srcs: ["arch-arm-armv8-a/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
},
arm64: {
+ relative_install_path: "hw",
srcs: ["arch-arm64-armv8-a/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
},
},
diff --git a/arm64/configs/vndkcore.libraries.txt b/arm64/configs/vndkcore.libraries.28.txt
similarity index 100%
rename from arm64/configs/vndkcore.libraries.txt
rename to arm64/configs/vndkcore.libraries.28.txt
diff --git a/arm64/configs/vndkprivate.libraries.txt b/arm64/configs/vndkprivate.libraries.28.txt
similarity index 100%
rename from arm64/configs/vndkprivate.libraries.txt
rename to arm64/configs/vndkprivate.libraries.28.txt
diff --git a/x86/Android.bp b/x86/Android.bp
index d31cc0e..36ba26b 100644
--- a/x86/Android.bp
+++ b/x86/Android.bp
@@ -237,6 +237,8 @@
"ld.config.28.txt",
"llndk.libraries.28.txt",
"vndksp.libraries.28.txt",
+ "vndkcore.libraries.28.txt",
+ "vndkprivate.libraries.28.txt",
],
}
@@ -3403,9 +3405,9 @@
enabled: true,
support_system_process: true,
},
- relative_install_path: "hw",
arch: {
x86: {
+ relative_install_path: "hw",
srcs: ["arch-x86-x86/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
},
},
diff --git a/x86/binder32/Android.bp b/x86/binder32/Android.bp
index e07fe27..92b3128 100644
--- a/x86/binder32/Android.bp
+++ b/x86/binder32/Android.bp
@@ -237,6 +237,8 @@
"ld.config.28.txt",
"llndk.libraries.28.txt",
"vndksp.libraries.28.txt",
+ "vndkcore.libraries.28.txt",
+ "vndkprivate.libraries.28.txt",
],
}
@@ -3610,9 +3612,9 @@
enabled: true,
support_system_process: true,
},
- relative_install_path: "hw",
arch: {
x86: {
+ relative_install_path: "hw",
srcs: ["arch-x86-x86/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
},
},
diff --git a/x86/configs/vndkcore.libraries.txt b/x86/configs/vndkcore.libraries.28.txt
similarity index 100%
rename from x86/configs/vndkcore.libraries.txt
rename to x86/configs/vndkcore.libraries.28.txt
diff --git a/x86/configs/vndkprivate.libraries.txt b/x86/configs/vndkprivate.libraries.28.txt
similarity index 100%
rename from x86/configs/vndkprivate.libraries.txt
rename to x86/configs/vndkprivate.libraries.28.txt
diff --git a/x86_64/Android.bp b/x86_64/Android.bp
index 7b9527a..ea4e2a5 100644
--- a/x86_64/Android.bp
+++ b/x86_64/Android.bp
@@ -238,6 +238,8 @@
"ld.config.28.txt",
"llndk.libraries.28.txt",
"vndksp.libraries.28.txt",
+ "vndkcore.libraries.28.txt",
+ "vndkprivate.libraries.28.txt",
],
}
@@ -3971,12 +3973,13 @@
enabled: true,
support_system_process: true,
},
- relative_install_path: "hw",
arch: {
x86: {
+ relative_install_path: "hw",
srcs: ["arch-x86-x86_64/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
},
x86_64: {
+ relative_install_path: "hw",
srcs: ["arch-x86_64-x86_64/shared/vndk-sp/android.hidl.memory@1.0-impl.so"],
},
},
diff --git a/x86_64/configs/vndkcore.libraries.txt b/x86_64/configs/vndkcore.libraries.28.txt
similarity index 100%
rename from x86_64/configs/vndkcore.libraries.txt
rename to x86_64/configs/vndkcore.libraries.28.txt
diff --git a/x86_64/configs/vndkprivate.libraries.txt b/x86_64/configs/vndkprivate.libraries.28.txt
similarity index 100%
rename from x86_64/configs/vndkprivate.libraries.txt
rename to x86_64/configs/vndkprivate.libraries.28.txt