Merge "Scudo minimal runtime support for prebuilts"android-o-mr1-iot-release-smart-display-r3oreo-mr1-1.2-iot-release

1 files changed, 72 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index b27f875b..419123db 100644
--- a/Android.bp
+++ b/Android.bp
@@ -395,6 +395,10 @@ libclang_rt_prebuilt_library_static {
 libclang_rt_prebuilt_library_shared {
     name: "libclang_rt.scudo-arm-android",
     enabled: false,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     arch: {
         arm: {
             enabled: true,
@@ -405,6 +409,10 @@ libclang_rt_prebuilt_library_shared {
 libclang_rt_prebuilt_library_shared {
     name: "libclang_rt.scudo-aarch64-android",
     enabled: false,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     arch: {
         arm64: {
             enabled: true,
@@ -415,6 +423,10 @@ libclang_rt_prebuilt_library_shared {
 libclang_rt_prebuilt_library_shared {
     name: "libclang_rt.scudo-i686-android",
     enabled: false,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     arch: {
         x86: {
             enabled: true,
@@ -425,6 +437,66 @@ libclang_rt_prebuilt_library_shared {
 libclang_rt_prebuilt_library_shared {
     name: "libclang_rt.scudo-x86_64-android",
     enabled: false,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        x86_64: {
+            enabled: true,
+        },
+    },
+}
+
+libclang_rt_prebuilt_library_shared {
+    name: "libclang_rt.scudo_minimal-arm-android",
+    enabled: false,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm: {
+            enabled: true,
+        },
+    },
+}
+
+libclang_rt_prebuilt_library_shared {
+    name: "libclang_rt.scudo_minimal-aarch64-android",
+    enabled: false,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        arm64: {
+            enabled: true,
+        },
+    },
+}
+
+libclang_rt_prebuilt_library_shared {
+    name: "libclang_rt.scudo_minimal-i686-android",
+    enabled: false,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+    arch: {
+        x86: {
+            enabled: true,
+        },
+    },
+}
+
+libclang_rt_prebuilt_library_shared {
+    name: "libclang_rt.scudo_minimal-x86_64-android",
+    enabled: false,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     arch: {
         x86_64: {
             enabled: true,