diff options
| -rw-r--r-- | BoardConfig-common.mk | 2 | ||||
| -rw-r--r-- | aoc/device.mk | 2 | ||||
| -rw-r--r-- | device.mk | 2 | ||||
| -rw-r--r-- | edgetpu/edgetpu.mk | 4 | ||||
| -rw-r--r-- | sepolicy/gs201-sepolicy.mk | 14 | ||||
| -rw-r--r-- | sepolicy/whitechapel_pro/keys.conf | 12 | ||||
| -rw-r--r-- | widevine/device.mk | 2 |
7 files changed, 19 insertions, 19 deletions
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index bb2910a5..0bdd8db1 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -411,7 +411,7 @@ BOARD_VENDOR_KERNEL_MODULES := $(KERNEL_MODULES) # Using BUILD_COPY_HEADERS BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true -include device/google/gs201-sepolicy/gs201-sepolicy.mk +include device/google/gs201/sepolicy/gs201-sepolicy.mk # Battery options BOARD_KERNEL_CMDLINE += at24.write_timeout=100 diff --git a/aoc/device.mk b/aoc/device.mk index 3c04b09f..5319358b 100644 --- a/aoc/device.mk +++ b/aoc/device.mk @@ -1,7 +1,7 @@ PRODUCT_PACKAGES += \ aocd -BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201-sepolicy/aoc +BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201/sepolicy/aoc ifeq (,$(filter aosp_%,$(TARGET_PRODUCT))) # IAudioMetricExt HIDL @@ -957,7 +957,7 @@ PRODUCT_COPY_FILES += \ #GPS HAL include device/google/gs201/gnss/device-gnss.mk endif -BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201-sepolicy/gps +BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201/sepolicy/gps $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) #$(call inherit-product, hardware/google_devices/exynos5/exynos5.mk) diff --git a/edgetpu/edgetpu.mk b/edgetpu/edgetpu.mk index c97b5abc..d2f287c6 100644 --- a/edgetpu/edgetpu.mk +++ b/edgetpu/edgetpu.mk @@ -24,5 +24,5 @@ PRODUCT_PACKAGES += \ # TPU metrics logger library PRODUCT_PACKAGES += \ libmetrics_logger -BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/edgetpu/ -BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201-sepolicy/edgetpu/ +BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101/sepolicy/edgetpu/ +BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201/sepolicy/edgetpu/ diff --git a/sepolicy/gs201-sepolicy.mk b/sepolicy/gs201-sepolicy.mk index 664b851f..a1afdbf0 100644 --- a/sepolicy/gs201-sepolicy.mk +++ b/sepolicy/gs201-sepolicy.mk @@ -1,23 +1,23 @@ # sepolicy that are shared among devices using whitechapel -BOARD_SEPOLICY_DIRS += device/google/gs201-sepolicy/whitechapel_pro +BOARD_SEPOLICY_DIRS += device/google/gs201/sepolicy/whitechapel_pro # unresolved SELinux error log with bug tracking -BOARD_SEPOLICY_DIRS += device/google/gs201-sepolicy/tracking_denials +BOARD_SEPOLICY_DIRS += device/google/gs201/sepolicy/tracking_denials -PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/gs201-sepolicy/private +PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/gs201/sepolicy/private # system_ext -SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += device/google/gs201-sepolicy/system_ext/public -SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/gs201-sepolicy/system_ext/private +SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += device/google/gs201/sepolicy/system_ext/public +SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/gs201/sepolicy/system_ext/private # # Pixel-wide # # Dauntless sepolicy (b/199685763) -BOARD_SEPOLICY_DIRS += device/google/gs201-sepolicy/dauntless +BOARD_SEPOLICY_DIRS += device/google/gs201/sepolicy/dauntless # PowerStats HAL BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/powerstats # Health HAL -BOARD_SEPOLICY_DIRS += device/google/gs201-sepolicy/health +BOARD_SEPOLICY_DIRS += device/google/gs201/sepolicy/health diff --git a/sepolicy/whitechapel_pro/keys.conf b/sepolicy/whitechapel_pro/keys.conf index 54130ea2..5aeead5c 100644 --- a/sepolicy/whitechapel_pro/keys.conf +++ b/sepolicy/whitechapel_pro/keys.conf @@ -1,17 +1,17 @@ [@GOOGLE] -ALL : device/google/gs201-sepolicy/whitechapel_pro/certs/app.x509.pem +ALL : device/google/gs201/sepolicy/whitechapel_pro/certs/app.x509.pem [@MDS] -ALL : device/google/gs201-sepolicy/whitechapel_pro/certs/com_google_mds.x509.pem +ALL : device/google/gs201/sepolicy/whitechapel_pro/certs/com_google_mds.x509.pem [@UWB] -ALL : device/google/gs201-sepolicy/whitechapel_pro/certs/com_qorvo_uwb.x509.pem +ALL : device/google/gs201/sepolicy/whitechapel_pro/certs/com_qorvo_uwb.x509.pem [@EUICCSUPPORTPIXEL] -ALL : device/google/gs201-sepolicy/whitechapel_pro/certs/EuiccSupportPixel.x509.pem +ALL : device/google/gs201/sepolicy/whitechapel_pro/certs/EuiccSupportPixel.x509.pem [@CAMERAENG] -ALL : device/google/gs201-sepolicy/whitechapel_pro/certs/camera_eng.x509.pem +ALL : device/google/gs201/sepolicy/whitechapel_pro/certs/camera_eng.x509.pem [@CAMERAFISHFOOD] -ALL : device/google/gs201-sepolicy/whitechapel_pro/certs/camera_fishfood.x509.pem +ALL : device/google/gs201/sepolicy/whitechapel_pro/certs/camera_fishfood.x509.pem diff --git a/widevine/device.mk b/widevine/device.mk index 467aa386..cd75ade3 100644 --- a/widevine/device.mk +++ b/widevine/device.mk @@ -1,4 +1,4 @@ PRODUCT_PACKAGES += \ android.hardware.drm-service.clearkey \ android.hardware.drm-service.widevine -BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201-sepolicy/widevine +BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201/sepolicy/widevine |