Include device sepolicy am: 26bbdd1d56 am: af300bd8be
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/23613847
Change-Id: Iffdcee2a6eb31f12ff2ab10b028ff2e9eef433c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/device-oriole.mk b/device-oriole.mk
index d9dff81..22e1801 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -14,6 +14,9 @@
# limitations under the License.
#
+# Restrict the visibility of Android.bp files to improve build analysis time
+$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
+
TARGET_KERNEL_DIR ?= device/google/raviole-kernel
TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
@@ -25,21 +28,22 @@
$(call inherit-product-if-exists, vendor/google/camera/devices/raviole/oriole/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/WallpapersOriole.mk)
-GOODIX_CONFIG_BUILD_VERSION := g6_trusty
DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay
include device/google/raviole/audio/oriole/audio-tables.mk
include device/google/gs101/device-shipping-common.mk
-include device/google/gs101/fingerprint/udfps_common.mk
include device/google/gs101/telephony/pktrouter.mk
include hardware/google/pixel/vibrator/cs40l25/device.mk
include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/touch/stm/stm11.mk
-ifeq ($(filter factory_oriole, $(TARGET_PRODUCT)),)
-include device/google/gs101/fingerprint/udfps_shipping.mk
+# Fingerprint HAL
+GOODIX_CONFIG_BUILD_VERSION := g6_trusty
+include vendor/goodix/udfps/configuration/udfps_common.mk
+ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
+include vendor/goodix/udfps/configuration/udfps_shipping.mk
else
-include device/google/gs101/fingerprint/udfps_factory.mk
+include vendor/goodix/udfps/configuration/udfps_factory.mk
endif
# go/lyric-soong-variables
@@ -70,6 +74,9 @@
PRODUCT_COPY_FILES += \
device/google/raviole/powerhint-oriole.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
+# Bluetooth sepolicy
+include device/google/gs101-sepolicy/oriole-sepolicy.mk
+
# Bluetooth
PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.a2dp_aac.vbr_supported=true \
diff --git a/device-raven.mk b/device-raven.mk
index 2afddb6..649ed19 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -14,6 +14,9 @@
# limitations under the License.
#
+# Restrict the visibility of Android.bp files to improve build analysis time
+$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
+
TARGET_KERNEL_DIR ?= device/google/raviole-kernel
TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
@@ -25,21 +28,21 @@
$(call inherit-product-if-exists, vendor/google/camera/devices/raviole/raven/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/WallpapersRaven.mk)
-GOODIX_CONFIG_BUILD_VERSION := g6_trusty
DEVICE_PACKAGE_OVERLAYS += device/google/raviole/raven/overlay
include device/google/raviole/audio/raven/audio-tables.mk
include device/google/gs101/device-shipping-common.mk
-include device/google/gs101/fingerprint/udfps_common.mk
include device/google/gs101/telephony/pktrouter.mk
include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/touch/lsi/lsi.mk
-
-ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),)
-include device/google/gs101/fingerprint/udfps_shipping.mk
+# Fingerprint HAL
+GOODIX_CONFIG_BUILD_VERSION := g6_trusty
+include vendor/goodix/udfps/configuration/udfps_common.mk
+ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
+include vendor/goodix/udfps/configuration/udfps_shipping.mk
else
-include device/google/gs101/fingerprint/udfps_factory.mk
+include vendor/goodix/udfps/configuration/udfps_factory.mk
endif
ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),)
@@ -81,6 +84,9 @@
PRODUCT_PACKAGES += \
UwbOverlayR4
+# Bluetooth sepolicy
+include device/google/gs101-sepolicy/raven-sepolicy.mk
+
# Bluetooth
PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.a2dp_aac.vbr_supported=true \