Add telephony permission xml files am: 9e65479af5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/13253872
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8ba45b69bcd1c9cb11db1fb6fba7f2d60f448857
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 3e36787..366759c 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,6 +16,7 @@
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/aosp_redfin.mk \
+ $(LOCAL_DIR)/aosp_redfin_hwasan.mk \
COMMON_LUNCH_CHOICES := \
aosp_redfin-userdebug \
diff --git a/aosp_redfin.mk b/aosp_redfin.mk
index 25756bc..9245cee 100644
--- a/aosp_redfin.mk
+++ b/aosp_redfin.mk
@@ -21,8 +21,7 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
# Enable mainline checking
-# TODO(b/138706293): Enable mainline checking later
-# PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
+PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := strict
#
# All components inherited here go to system_ext image
@@ -50,6 +49,12 @@
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/aosp_excluded_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/aosp_excluded_hardware.xml
+# Keep the VNDK APEX in /system partition for REL branches as these branches are
+# expected to have stable API/ABI surfaces.
+ifneq (REL,$(PLATFORM_VERSION_CODENAME))
+ PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
+endif
+
# Don't build super.img.
PRODUCT_BUILD_SUPER_PARTITION := false
diff --git a/aosp_redfin_hwasan.mk b/aosp_redfin_hwasan.mk
new file mode 100644
index 0000000..a4073e4
--- /dev/null
+++ b/aosp_redfin_hwasan.mk
@@ -0,0 +1,23 @@
+#
+# Copyright 2020 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.
+#
+
+$(call inherit-product, device/google/redfin/aosp_redfin.mk)
+PRODUCT_NAME := aosp_redfin_hwasan
+
+# Add "hwaddress" as a global sanitizer if it's missing.
+ifeq ($(filter hwaddress,$(SANITIZE_TARGET)),)
+ SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) hwaddress)
+endif
