From 42c682f3d0fe1428453870aea062b3d1a606d654 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Tue, 16 Mar 2021 21:27:25 +0800 Subject: [PATCH 1/3] raviole: remove redundant includes vendor/google_devices/raven/proprietary/device-vendor.mk vendor/google_devices/oriole/proprietary/device-vendor.mk Bug: 167996145 Change-Id: I43557b6671ac3b15ee70bc4300a842ebaa8a1f8c --- device-oriole.mk | 1 - device-raven.mk | 1 - 2 files changed, 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 1ca4cad..4b3308a 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -19,7 +19,6 @@ TARGET_KERNEL_DIR := device/google/raviole-kernel $(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 f9f351b..b59211a 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -19,7 +19,6 @@ TARGET_KERNEL_DIR := device/google/raviole-kernel $(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 From 98d9dd1e00e688b391db432ea017669099ca10dc Mon Sep 17 00:00:00 2001 From: Ilya Matyukhin Date: Tue, 16 Mar 2021 20:17:14 -0700 Subject: [PATCH 2/3] raven: run trusty_apploader from system shell for faceauth Bug: 182953825 Test: on device Change-Id: I27ec828b4c8e80e2b1dcfdc480bca069e18ebf22 --- conf/init.raven.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/init.raven.rc b/conf/init.raven.rc index 9eb01b9..e7ba699 100644 --- a/conf/init.raven.rc +++ b/conf/init.raven.rc @@ -29,7 +29,7 @@ on fs exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g6.app # Face - exec_background /vendor/bin/trusty_apploader /vendor/firmware/faceauth.app + exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/faceauth.app on property:mfgapi.touchpanel.permission=1 chmod 0600 /sys/devices/virtual/sec/tsp/cmd From c2e4a48eaf6456ed239d319ce62446ebfb734244 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 17 Mar 2021 05:53:25 +0000 Subject: [PATCH 3/3] Revert "raviole: remove redundant includes" Revert submission 13885469-whi-common-folder-post Reason for revert: Those are not redundant. They are needed for AOSP builds. Reverted Changes: I43557b667:raviole: remove redundant includes I7a5981fae:blueport: remove redundant includes Change-Id: I21c98ac4876c8cbab96b9d8af5967103cf6eb9ee --- device-oriole.mk | 1 + device-raven.mk | 1 + 2 files changed, 2 insertions(+) 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 @@ TARGET_KERNEL_DIR := device/google/raviole-kernel $(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 @@ TARGET_KERNEL_DIR := device/google/raviole-kernel $(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