release-request-957cd691-fb71-4770-8ff7-a3b9602655a5-for-git_oc-mr1-release-4314464 snap-temp-L54400000099147910android-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r9android-8.1.0_r8android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-release

Change-Id: I1b52990426fa7a38bdf3c61a9f100b08a7797508

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,