commit a5e19e432d8178d650be30a013ca3a8dc272e693
author Kostya Kortchinsky <kostyak@google.com> Fri Oct 12 16:49:31 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 12 16:49:31 2018 +0000
tree e765d53c866d1a55f8200669ead056e0ad941307
parent f1749d53880a6f22465304f9898f4df3b82ced51
parent 4b1d4a1dfcdd9a7344261fb357696aa30862b86f

Merge "Scudo minimal runtime support for prebuilts"

Android.bp

diff --git a/Android.bp b/Android.bp
index b27f875..419123d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -395,6 +395,10 @@
 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 {
     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 {
     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 {
     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,