From b2d7dc9459f1f95706c633b0abca2905fb2dd4e7 Mon Sep 17 00:00:00 2001
From: Adam Shih <adamshih@google.com>
Date: Tue, 4 Oct 2022 09:02:17 +0800
Subject: [PATCH 1/3] move trusty dump from gs101 to gs-common

Bug: 244504232
Test: adb bugreport
Change-Id: I486f18dc55eea3843972d856e81d736cd6c25141
---
 device.mk                     | 3 +++
 dumpstate/DumpstateDevice.cpp | 5 -----
 dumpstate/DumpstateDevice.h   | 1 -
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/device.mk b/device.mk
index 2c6bf660..bbf7439c 100644
--- a/device.mk
+++ b/device.mk
@@ -822,6 +822,9 @@ endif
 $(call inherit-product, system/core/trusty/trusty-storage.mk)
 $(call inherit-product, system/core/trusty/trusty-base.mk)
 
+# Trusty dump
+include device/google/gs-common/trusty/trusty.mk
+
 # Trusty unit test tool
 PRODUCT_PACKAGES_DEBUG += trusty-ut-ctrl
 
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 0c13943d..34b1433f 100644
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -262,7 +262,6 @@ DumpstateDevice::DumpstateDevice()
         { "aoc", [this](int fd) { dumpAoCSection(fd); } },
         { "misc", [this](int fd) { dumpMiscSection(fd); } },
         { "camera", [this](int fd) { dumpCameraSection(fd); } },
-        { "trusty", [this](int fd) { dumpTrustySection(fd); } },
     } {
 }
 
@@ -974,10 +973,6 @@ void DumpstateDevice::dumpCameraSection(int fd) {
                        CommandOptions::WithTimeout(4).Build());
 }
 
-void DumpstateDevice::dumpTrustySection(int fd) {
-    DumpFileToFd(fd, "Trusty TEE0 Logs", "/dev/trusty-log0");
-}
-
 static void *dumpModemThread(void *data) {
     std::string modemLogDir = MODEM_LOG_DIRECTORY;
     std::string extendedLogDir = MODEM_EXTENDED_LOG_DIRECTORY;
diff --git a/dumpstate/DumpstateDevice.h b/dumpstate/DumpstateDevice.h
index db0779f4..2247b3dc 100644
--- a/dumpstate/DumpstateDevice.h
+++ b/dumpstate/DumpstateDevice.h
@@ -74,7 +74,6 @@ struct DumpstateDevice : public IDumpstateDevice {
     void dumpAoCSection(int fd);
     void dumpMiscSection(int fd);
     void dumpCameraSection(int fd);
-    void dumpTrustySection(int fd);
 };
 
 }  // namespace implementation

From 7d9af76bb9766adf7872ca8bf9fba8457255e111 Mon Sep 17 00:00:00 2001
From: Kris Chen <chenkris@google.com>
Date: Mon, 10 Oct 2022 06:05:53 +0800
Subject: [PATCH 2/3] udfps: enable android fingerprint only for non-factory
 builds

Bug: 244291767
Test: Perform UDFPS factory calibration test
Change-Id: Icca078fd1b91d9cfee7af02153c790c5f33e6f51
---
 fingerprint/udfps_common.mk   | 3 ---
 fingerprint/udfps_shipping.mk | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fingerprint/udfps_common.mk b/fingerprint/udfps_common.mk
index 9d413196..58088568 100644
--- a/fingerprint/udfps_common.mk
+++ b/fingerprint/udfps_common.mk
@@ -14,9 +14,6 @@
 # limitations under the License.
 #
 
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
-
 # Fingerprint manifest
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 DEVICE_MANIFEST_FILE += \
diff --git a/fingerprint/udfps_shipping.mk b/fingerprint/udfps_shipping.mk
index ed88f66b..c8203b18 100644
--- a/fingerprint/udfps_shipping.mk
+++ b/fingerprint/udfps_shipping.mk
@@ -14,5 +14,8 @@
 # limitations under the License.
 #
 
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
+
 PRODUCT_PACKAGES += \
     android.hardware.biometrics.fingerprint-service.goodix

From 2aa333c7c86c0c6a0a65070fd6ed5c20681f8fb6 Mon Sep 17 00:00:00 2001
From: Yi-Yo Chiang <yochiang@google.com>
Date: Thu, 6 Oct 2022 16:26:27 +0800
Subject: [PATCH 3/3] Remove references to BOARD_BUILD_SYSTEM_ROOT_IMAGE

This variable is always false or empty now.
Remove it so we can mark it as deprecated later.

Bug: 241346584
Test: Presubmit
Change-Id: I57cbe875f556bb853d4ea9b1d458c9c554c6bfa5
---
 BoardConfig-common.mk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 1b246e13..e92a6bec 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -343,9 +343,6 @@ BOARD_BOOTIMAGE_PARTITION_SIZE := 0x04000000
 BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE := 0x04000000
 BOARD_DTBOIMG_PARTITION_SIZE := 0x01000000
 
-# System As Root
-BOARD_BUILD_SYSTEM_ROOT_IMAGE := false
-
 # Vendor ramdisk image for kernel development
 BOARD_BUILD_VENDOR_RAMDISK_IMAGE := true