Merge "Add AOSP support for Raven and Oriole." into sc-dev
diff --git a/device-oriole.mk b/device-oriole.mk
index 4b3308a..1ca4cad 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -19,6 +19,7 @@
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk)
+$(call inherit-product-if-exists, vendor/google_devices/oriole/proprietary/device-vendor.mk)
DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay
diff --git a/device-raven.mk b/device-raven.mk
index b59211a..f9f351b 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -19,6 +19,7 @@
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-raven.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk)
+$(call inherit-product-if-exists, vendor/google_devices/raven/proprietary/device-vendor.mk)
DEVICE_PACKAGE_OVERLAYS += device/google/raviole/raven/overlay
diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk
index 84814e3..d94b836 100644
--- a/oriole/BoardConfig.mk
+++ b/oriole/BoardConfig.mk
@@ -20,3 +20,4 @@
include device/google/gs101/BoardConfig-common.mk
-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+-include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk
diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk
index cdd3e89..6d752a4 100644
--- a/raven/BoardConfig.mk
+++ b/raven/BoardConfig.mk
@@ -20,3 +20,4 @@
include device/google/gs101/BoardConfig-common.mk
-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+-include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk