Mark libclang_rt* prebuilts as VNDKoreo-mr1-dev

There was a bug in the build system that allowed a VNDK lib to link
against to a lib in vendor partition. These libclang_rt* prebuilts
are used by some VNDK libraries (e.g. libstagefright_foundatation) which
are sanitized.

Since the bug in the build system has been fixed, we need to fix the
violation by correctly marking these prebuilt as VNDK so that they are
installed to the system partition.

Bug: 64994918
Test: no link_type check error on libclang_rt when building 2017 pixel
devices where BOARD_VNDK_VERSION=current.

Merged-In: Ib5a831734c9d40387153a5e07791bbbf3b93f653
Change-Id: Ib5a831734c9d40387153a5e07791bbbf3b93f653
(cherry picked from commit c0674d4d25d8555d2e8a9beb7ba5e1f3fb144817)

1 files changed, 36 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index a46a7653..f2431768 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,6 +25,9 @@ libclang_rt_prebuilt_library_shared {
     name: "libclang_rt.asan-arm-android",
     enabled: false,
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     arch: {
         arm: {
             enabled: true,
@@ -36,6 +39,9 @@ libclang_rt_prebuilt_library_shared {
     name: "libclang_rt.asan-aarch64-android",
     enabled: false,
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     arch: {
         arm64: {
             enabled: true,
@@ -47,6 +53,9 @@ libclang_rt_prebuilt_library_shared {
     name: "libclang_rt.asan-mips-android",
     enabled: false,
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     arch: {
         mips: {
             enabled: true,
@@ -58,6 +67,9 @@ libclang_rt_prebuilt_library_shared {
     name: "libclang_rt.asan-mips64-android",
     enabled: false,
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     arch: {
         mips64: {
             enabled: true,
@@ -69,6 +81,9 @@ libclang_rt_prebuilt_library_shared {
     name: "libclang_rt.asan-i686-android",
     enabled: false,
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     arch: {
         x86: {
             enabled: true,
@@ -80,6 +95,9 @@ libclang_rt_prebuilt_library_shared {
     name: "libclang_rt.asan-x86_64-android",
     enabled: false,
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     arch: {
         x86_64: {
             enabled: true,
@@ -91,6 +109,9 @@ libclang_rt_prebuilt_library_shared {
     name: "libclang_rt.ubsan_standalone-arm-android",
     enabled: false,
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     arch: {
         arm: {
             enabled: true,
@@ -102,6 +123,9 @@ libclang_rt_prebuilt_library_shared {
     name: "libclang_rt.ubsan_standalone-aarch64-android",
     enabled: false,
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     arch: {
         arm64: {
             enabled: true,
@@ -113,6 +137,9 @@ libclang_rt_prebuilt_library_shared {
     name: "libclang_rt.ubsan_standalone-mips-android",
     enabled: false,
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     arch: {
         mips: {
             enabled: true,
@@ -124,6 +151,9 @@ libclang_rt_prebuilt_library_shared {
     name: "libclang_rt.ubsan_standalone-mips64-android",
     enabled: false,
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     arch: {
         mips64: {
             enabled: true,
@@ -135,6 +165,9 @@ libclang_rt_prebuilt_library_shared {
     name: "libclang_rt.ubsan_standalone-i686-android",
     enabled: false,
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     arch: {
         x86: {
             enabled: true,
@@ -146,6 +179,9 @@ libclang_rt_prebuilt_library_shared {
     name: "libclang_rt.ubsan_standalone-x86_64-android",
     enabled: false,
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     arch: {
         x86_64: {
             enabled: true,