commit 9cd2c7ca5497ca74f84f52ff46884125eda914a1
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 17 05:43:27 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 17 05:43:27 2021 +0000
tree 44748d17c661668ed743ba895369188b64c66935
parent 2a914e07bd3d82ea25e04bae561a8d2666f81f7b
parent 98d9dd1e00e688b391db432ea017669099ca10dc

Merge "raven: run trusty_apploader from system shell for faceauth" into sc-dev

device-oriole.mk

diff --git a/device-oriole.mk b/device-oriole.mk
index 63d69b8..1a382ce 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -19,7 +19,6 @@
 $(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
 

device-raven.mk

diff --git a/device-raven.mk b/device-raven.mk
index f9f351b..b59211a 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -19,7 +19,6 @@
 $(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