summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2020-11-30 18:40:05 +0000
committerandroid-build-prod (mdb) <android-build-team-robot@google.com>2020-11-30 18:40:05 +0000
commit0c97d569ba1b53825054cda1deab8cdb346b0bf6 (patch)
treece00e81fdcc3f1fb0c8755a95b057e5abd61176f
parent17d4bbf0a8bb4573a63a682a3d38bd505b2d1ac6 (diff)
parent461ef3d64c50da10de99138b15fb1cba7d1c33d9 (diff)
downloaddevice_google_wahoo-simpleperf-release.tar.gz
device_google_wahoo-simpleperf-release.tar.bz2
device_google_wahoo-simpleperf-release.zip
Snap for 7002008 from 461ef3d64c50da10de99138b15fb1cba7d1c33d9 to simpleperf-releasesimpleperf-release
Change-Id: I4c7b9eaca01d1d7ef85a5dc5123878ddbfe6eee2
-rw-r--r--BoardConfig.mk6
-rwxr-xr-xdevice.mk2
-rw-r--r--sepolicy/public/hwservice.te4
-rw-r--r--sepolicy/vendor/hwservice.te12
4 files changed, 13 insertions, 11 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 07cd1acd..c06f9db5 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -90,8 +90,8 @@ BOARD_USES_SYSTEM_OTHER_ODEX := true
BOARD_ROOT_EXTRA_FOLDERS := persist firmware metadata
BOARD_VENDOR_SEPOLICY_DIRS += device/google/wahoo/sepolicy/vendor
-BOARD_PLAT_PUBLIC_SEPOLICY_DIR := device/google/wahoo/sepolicy/public
-BOARD_PLAT_PRIVATE_SEPOLICY_DIR := device/google/wahoo/sepolicy/private
+SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS := device/google/wahoo/sepolicy/public
+SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS := device/google/wahoo/sepolicy/private
BOARD_VENDOR_SEPOLICY_DIRS += device/google/wahoo/sepolicy/verizon
TARGET_FS_CONFIG_GEN := device/google/wahoo/config.fs
@@ -180,3 +180,5 @@ AB_OTA_PARTITIONS += \
system \
vbmeta \
dtbo
+
+BUILD_BROKEN_ENFORCE_SYSPROP_OWNER := true
diff --git a/device.mk b/device.mk
index 80e08ae2..f18d9663 100755
--- a/device.mk
+++ b/device.mk
@@ -47,7 +47,7 @@ PRODUCT_COPY_FILES += \
# Set the SVN for the targeted MR release
PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.build.svn=50
+ ro.vendor.build.svn=52
# Enforce privapp-permissions whitelist
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/sepolicy/public/hwservice.te b/sepolicy/public/hwservice.te
index 73653011..d777744a 100644
--- a/sepolicy/public/hwservice.te
+++ b/sepolicy/public/hwservice.te
@@ -1,2 +1,2 @@
-type hal_cne_hwservice, hwservice_manager_type;
-type hal_imsrcsd_hwservice, hwservice_manager_type;
+type hal_cne_hwservice, hwservice_manager_type, vendor_hwservice_type;
+type hal_imsrcsd_hwservice, hwservice_manager_type, vendor_hwservice_type;
diff --git a/sepolicy/vendor/hwservice.te b/sepolicy/vendor/hwservice.te
index 9bc1dfaa..b47d3b4d 100644
--- a/sepolicy/vendor/hwservice.te
+++ b/sepolicy/vendor/hwservice.te
@@ -1,6 +1,6 @@
-type vnd_ims_radio_hwservice, hwservice_manager_type;
-type vnd_qcrilhook_hwservice, hwservice_manager_type;
-type vnd_atcmdfwd_hwservice, hwservice_manager_type;
-type hal_imsrtp_hwservice, hwservice_manager_type;
-type nxpnfc_hwservice, hwservice_manager_type;
-type nxpese_hwservice, hwservice_manager_type;
+type vnd_ims_radio_hwservice, hwservice_manager_type, vendor_hwservice_type;
+type vnd_qcrilhook_hwservice, hwservice_manager_type, vendor_hwservice_type;
+type vnd_atcmdfwd_hwservice, hwservice_manager_type, vendor_hwservice_type;
+type hal_imsrtp_hwservice, hwservice_manager_type, vendor_hwservice_type;
+type nxpnfc_hwservice, hwservice_manager_type, vendor_hwservice_type;
+type nxpese_hwservice, hwservice_manager_type, vendor_hwservice_type;