gs101: Update sepolicy pathHEADtachibana-mr1

Change-Id: I4bcee50514c02294137ea5ac6e64c64d69308bd4

12 files changed, 24 insertions, 24 deletions

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 0538b86c..ea3a882e 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -376,7 +376,7 @@ BOARD_VENDOR_KERNEL_MODULES := $(KERNEL_MODULES)
 # Using BUILD_COPY_HEADERS
 BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true
 
-include device/google/gs101-sepolicy/gs101-sepolicy.mk
+include device/google/gs101/sepolicy/gs101-sepolicy.mk
 
 # Battery options
 BOARD_KERNEL_CMDLINE += at24.write_timeout=100
diff --git a/bluetooth/bluetooth.mk b/bluetooth/bluetooth.mk
index f2036106..77ec1aba 100644
--- a/bluetooth/bluetooth.mk
+++ b/bluetooth/bluetooth.mk
@@ -1,4 +1,4 @@
 PRODUCT_PACKAGES += \
 	android.hardware.bluetooth@1.1-service.bcmbtlinux
 
-BOARD_SEPOLICY_DIRS += device/google/gs101-sepolicy/bluetooth
+BOARD_SEPOLICY_DIRS += device/google/gs101/sepolicy/bluetooth
diff --git a/confirmationui/confirmationui.mk b/confirmationui/confirmationui.mk
index 85f77c94..d8edc897 100644
--- a/confirmationui/confirmationui.mk
+++ b/confirmationui/confirmationui.mk
@@ -6,4 +6,4 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
 	securedpud.slider
 
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/confirmationui/
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101/sepolicy/confirmationui/
diff --git a/edgetpu/edgetpu.mk b/edgetpu/edgetpu.mk
index 49658ed2..6d6fcc16 100644
--- a/edgetpu/edgetpu.mk
+++ b/edgetpu/edgetpu.mk
@@ -29,4 +29,4 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
 	libmetrics_logger
 
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/edgetpu/
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101/sepolicy/edgetpu/
diff --git a/modem/user.mk b/modem/user.mk
index fb01f2cc..da740610 100644
--- a/modem/user.mk
+++ b/modem/user.mk
@@ -1,4 +1,4 @@
 ifneq ($(BOARD_WITHOUT_RADIO),true)
   PRODUCT_PACKAGES += dmd
 endif
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/modem/user
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101/sepolicy/modem/user
diff --git a/modem/userdebug.mk b/modem/userdebug.mk
index 4fcab646..c56b7d5a 100644
--- a/modem/userdebug.mk
+++ b/modem/userdebug.mk
@@ -1,4 +1,4 @@
 ifneq ($(BOARD_WITHOUT_RADIO),true)
   PRODUCT_PACKAGES += vcd
 endif
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/modem/userdebug/
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101/sepolicy/modem/userdebug/
diff --git a/neuralnetwork/neuralnetwork.mk b/neuralnetwork/neuralnetwork.mk
index 1533d2a6..d4937b19 100644
--- a/neuralnetwork/neuralnetwork.mk
+++ b/neuralnetwork/neuralnetwork.mk
@@ -1,2 +1,2 @@
 PRODUCT_PACKAGES += android.hardware.neuralnetworks@1.3-service-armnn
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/neuralnetworks/
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101/sepolicy/neuralnetworks/
diff --git a/sepolicy/gs101-sepolicy.mk b/sepolicy/gs101-sepolicy.mk
index d33fcd4e..76ed327b 100644
--- a/sepolicy/gs101-sepolicy.mk
+++ b/sepolicy/gs101-sepolicy.mk
@@ -1,21 +1,21 @@
 # sepolicy that are shared among devices using whitechapel
-BOARD_SEPOLICY_DIRS += device/google/gs101-sepolicy/whitechapel/vendor/google
+BOARD_SEPOLICY_DIRS += device/google/gs101/sepolicy/whitechapel/vendor/google
 
 # unresolved SELinux error log with bug tracking
-BOARD_SEPOLICY_DIRS += device/google/gs101-sepolicy/tracking_denials
+BOARD_SEPOLICY_DIRS += device/google/gs101/sepolicy/tracking_denials
 
-PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/gs101-sepolicy/private
+PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/gs101/sepolicy/private
 
 # Display
-BOARD_SEPOLICY_DIRS += device/google/gs101-sepolicy/display/common
-BOARD_SEPOLICY_DIRS += device/google/gs101-sepolicy/display/gs101
+BOARD_SEPOLICY_DIRS += device/google/gs101/sepolicy/display/common
+BOARD_SEPOLICY_DIRS += device/google/gs101/sepolicy/display/gs101
 
 # Micro sensor framework (usf)
-BOARD_SEPOLICY_DIRS += device/google/gs101-sepolicy/usf
+BOARD_SEPOLICY_DIRS += device/google/gs101/sepolicy/usf
 
 # system_ext
-SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += device/google/gs101-sepolicy/system_ext/public
-SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/gs101-sepolicy/system_ext/private
+SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += device/google/gs101/sepolicy/system_ext/public
+SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/gs101/sepolicy/system_ext/private
 
 #
 # Pixel-wide
@@ -30,12 +30,12 @@ BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/powerstats
 BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/sscoredump
 
 # Public
-PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/gs101-sepolicy/public
+PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/gs101/sepolicy/public
 
 # pKVM
 ifeq ($(TARGET_PKVM_ENABLED),true)
-BOARD_SEPOLICY_DIRS += device/google/gs101-sepolicy/pkvm
+BOARD_SEPOLICY_DIRS += device/google/gs101/sepolicy/pkvm
 endif
 
 # Health HAL
-BOARD_SEPOLICY_DIRS += device/google/gs101-sepolicy/health
+BOARD_SEPOLICY_DIRS += device/google/gs101/sepolicy/health
diff --git a/sepolicy/whitechapel/vendor/google/keys.conf b/sepolicy/whitechapel/vendor/google/keys.conf
index fb6e52b6..8f30fc13 100644
--- a/sepolicy/whitechapel/vendor/google/keys.conf
+++ b/sepolicy/whitechapel/vendor/google/keys.conf
@@ -1,8 +1,8 @@
 [@MDS]
-ALL : device/google/gs101-sepolicy/whitechapel/vendor/google/certs/com_google_mds.x509.pem
+ALL : device/google/gs101/sepolicy/whitechapel/vendor/google/certs/com_google_mds.x509.pem
 
 [@UWB]
-ALL : device/google/gs101-sepolicy/whitechapel/vendor/google/certs/com_qorvo_uwb.x509.pem
+ALL : device/google/gs101/sepolicy/whitechapel/vendor/google/certs/com_qorvo_uwb.x509.pem
 
 [@EUICCSUPPORTPIXEL]
-ALL : device/google/gs101-sepolicy/whitechapel/vendor/google/certs/EuiccSupportPixel.x509.pem
+ALL : device/google/gs101/sepolicy/whitechapel/vendor/google/certs/EuiccSupportPixel.x509.pem
diff --git a/telephony/pktrouter.mk b/telephony/pktrouter.mk
index dd923b59..aaa8a71a 100644
--- a/telephony/pktrouter.mk
+++ b/telephony/pktrouter.mk
@@ -1,3 +1,3 @@
 PRODUCT_PACKAGES += wfc-pkt-router
 PRODUCT_PROPERTY_OVERRIDES += vendor.pktrouter=1
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/telephony/pktrouter
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101/sepolicy/telephony/pktrouter
diff --git a/telephony/user.mk b/telephony/user.mk
index f75596f3..a22f6d38 100644
--- a/telephony/user.mk
+++ b/telephony/user.mk
@@ -1,2 +1,2 @@
 PRODUCT_COPY_FILES += vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device/samsung/init.radio.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.radio.sh
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/telephony/user/
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101/sepolicy/telephony/user/
diff --git a/trusty_metricsd/trusty_metricsd.mk b/trusty_metricsd/trusty_metricsd.mk
index 487875be..ff95a1c6 100644
--- a/trusty_metricsd/trusty_metricsd.mk
+++ b/trusty_metricsd/trusty_metricsd.mk
@@ -3,4 +3,4 @@ PRODUCT_SOONG_NAMESPACES += \
 	vendor/google/trusty/common
 
 PRODUCT_PACKAGES += trusty_metricsd
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/trusty_metricsd
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101/sepolicy/trusty_metricsd