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)

2 files changed, 86 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,
diff --git a/CleanSpec.mk b/CleanSpec.mk
new file mode 100644
index 00000000..af639082
--- /dev/null
+++ b/CleanSpec.mk
@@ -0,0 +1,50 @@
+# Copyright (C) 2007 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list.  These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list.  E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+# For example:
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
+#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/lib/libclang_rt*)