release-request-957cd691-fb71-4770-8ff7-a3b9602655a5-for-git_oc-mr1-release-4314464 snap-temp-L54400000099147910
Change-Id: I1b52990426fa7a38bdf3c61a9f100b08a7797508
diff --git a/Android.bp b/Android.bp
index a46a765..f243176 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,6 +25,9 @@
name: "libclang_rt.asan-arm-android",
enabled: false,
vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
arch: {
arm: {
enabled: true,
@@ -36,6 +39,9 @@
name: "libclang_rt.asan-aarch64-android",
enabled: false,
vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
arch: {
arm64: {
enabled: true,
@@ -47,6 +53,9 @@
name: "libclang_rt.asan-mips-android",
enabled: false,
vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
arch: {
mips: {
enabled: true,
@@ -58,6 +67,9 @@
name: "libclang_rt.asan-mips64-android",
enabled: false,
vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
arch: {
mips64: {
enabled: true,
@@ -69,6 +81,9 @@
name: "libclang_rt.asan-i686-android",
enabled: false,
vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
arch: {
x86: {
enabled: true,
@@ -80,6 +95,9 @@
name: "libclang_rt.asan-x86_64-android",
enabled: false,
vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
arch: {
x86_64: {
enabled: true,
@@ -91,6 +109,9 @@
name: "libclang_rt.ubsan_standalone-arm-android",
enabled: false,
vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
arch: {
arm: {
enabled: true,
@@ -102,6 +123,9 @@
name: "libclang_rt.ubsan_standalone-aarch64-android",
enabled: false,
vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
arch: {
arm64: {
enabled: true,
@@ -113,6 +137,9 @@
name: "libclang_rt.ubsan_standalone-mips-android",
enabled: false,
vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
arch: {
mips: {
enabled: true,
@@ -124,6 +151,9 @@
name: "libclang_rt.ubsan_standalone-mips64-android",
enabled: false,
vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
arch: {
mips64: {
enabled: true,
@@ -135,6 +165,9 @@
name: "libclang_rt.ubsan_standalone-i686-android",
enabled: false,
vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
arch: {
x86: {
enabled: true,
@@ -146,6 +179,9 @@
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 0000000..af63908
--- /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*)
