From 133239452c6c57c0a5bc5f766edc6c52d4a8a463 Mon Sep 17 00:00:00 2001 From: Andrew Hexen Date: Mon, 2 Jan 2023 07:44:53 -0800 Subject: [PATCH] sm7325-common: Add berlna to guards Signed-off-by: Andrew Hexen Change-Id: Iac7b5aa9778ecb9d01c1dc54f18eccdbdfde48d7 --- Android.mk | 2 +- sepolicy/vendor/file_contexts | 1 + setup-makefiles.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index 69141b1..0c0c862 100644 --- a/Android.mk +++ b/Android.mk @@ -16,7 +16,7 @@ LOCAL_PATH := $(call my-dir) -ifneq ($(filter berlin dubai,$(TARGET_DEVICE)),) +ifneq ($(filter berlin berlna dubai,$(TARGET_DEVICE)),) subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH)) $(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk))) diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index d74838e..de1b8b3 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -46,6 +46,7 @@ /(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.3-service\.dubai u:object_r:hal_fingerprint_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service-ets u:object_r:hal_fingerprint_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service\.berlin u:object_r:hal_fingerprint_default_exec:s0 +/(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service\.berlna u:object_r:hal_fingerprint_default_exec:s0 /data/vendor/.fps(/.*)? u:object_r:fingerprint_vendor_data_file:s0 /data/vendor/egis(/.*)? u:object_r:fingerprint_vendor_data_file:s0 /data/vendor/fpc(/.*)? u:object_r:fingerprint_vendor_data_file:s0 diff --git a/setup-makefiles.sh b/setup-makefiles.sh index ab838f4..08bb0ac 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -25,7 +25,7 @@ source "${HELPER}" setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${ANDROID_ROOT}" true # Warning headers and guards -write_headers "berlin dubai" +write_headers "berlin berlna dubai" # The standard common blobs write_makefiles "${MY_DIR}/proprietary-files.txt" true