commit 3bf7ddf5bc8574334245a6a56c01f9c58be0110b
author Bharath <bharath@teamb58.org> Tue Apr 11 10:47:41 2023 +0530
committer Bharath <bharath@teamb58.org> Tue Apr 11 10:47:41 2023 +0530
tree e5981e7bc705ae3e4bb2e03f10578b31214c82d8
parent fcedd34afec8acb2ca278cc530accdf5d4c5dcf1
parent c1e7f516b156af41da70506a28246c6dbb5f0c42

Merge tag 'android-13.0.0_r38' into int/13/fp3

Android 13.0.0 Release 38 (TQ2A.230405.003)

* tag 'android-13.0.0_r38':
  DO NOT MERGE Revert "Disallow untrusted apps to read ro.debuggable and ro.secure"
  DO NOT MERGE Revert "Drop back-compatibility for hiding ro.debuggable and ro.secure"
  DO NOT MERGE Revert "Hide ro.debuggable and ro.secure from ephemeral and isolated applications"
  DO NOT MERGE Revert "Disallow untrusted apps to read ro.debuggable and ro.secure"
  DO NOT MERGE Revert "Drop back-compatibility for hiding ro.debuggable and ro.secure"
  DO NOT MERGE Revert "Hide ro.debuggable and ro.secure from ephemeral and isolated applications"

Change-Id: Ie9f35b8ad2a063f2067c181bd956be33b401dffb

Android.mk

diff --git a/Android.mk b/Android.mk
index 8fd90b0..50c265d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -54,15 +54,7 @@
 REQD_MASK_POLICY := $(LOCAL_PATH)/reqd_mask
 
 SYSTEM_EXT_PUBLIC_POLICY := $(SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS)
-ifneq (,$(BOARD_PLAT_PUBLIC_SEPOLICY_DIR))
-  # TODO: Disallow BOARD_PLAT_*
-  SYSTEM_EXT_PUBLIC_POLICY += $(BOARD_PLAT_PUBLIC_SEPOLICY_DIR)
-endif
 SYSTEM_EXT_PRIVATE_POLICY := $(SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS)
-ifneq (,$(BOARD_PLAT_PRIVATE_SEPOLICY_DIR))
-  # TODO: Disallow BOARD_PLAT_*
-  SYSTEM_EXT_PRIVATE_POLICY += $(BOARD_PLAT_PRIVATE_SEPOLICY_DIR)
-endif
 
 PRODUCT_PUBLIC_POLICY := $(PRODUCT_PUBLIC_SEPOLICY_DIRS)
 PRODUCT_PRIVATE_POLICY := $(PRODUCT_PRIVATE_SEPOLICY_DIRS)