Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Snap for 9163570 from b9b79645fd to udc-release

Browse source 
Change-Id: I5c3641417711f006a4a690c7fb529842e4c99b3f
This commit is contained in:
Android Build Coastguard Worker 2022-10-12 01:02:47 +00:00
commit 76e4a61cd1
6 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
BoardConfig-common.mk
View file

@ -343,9 +343,6 @@ BOARD_BOOTIMAGE_PARTITION_SIZE := 0x04000000
BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE := 0x04000000 BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE := 0x04000000
BOARD_DTBOIMG_PARTITION_SIZE := 0x01000000 BOARD_DTBOIMG_PARTITION_SIZE := 0x01000000
# System As Root
BOARD_BUILD_SYSTEM_ROOT_IMAGE := false
# Vendor ramdisk image for kernel development # Vendor ramdisk image for kernel development
BOARD_BUILD_VENDOR_RAMDISK_IMAGE := true BOARD_BUILD_VENDOR_RAMDISK_IMAGE := true

3
device.mk
View file

@ -822,6 +822,9 @@ endif
$(call inherit-product, system/core/trusty/trusty-storage.mk) $(call inherit-product, system/core/trusty/trusty-storage.mk)
$(call inherit-product, system/core/trusty/trusty-base.mk) $(call inherit-product, system/core/trusty/trusty-base.mk)
# Trusty dump
include device/google/gs-common/trusty/trusty.mk
# Trusty unit test tool # Trusty unit test tool
PRODUCT_PACKAGES_DEBUG += trusty-ut-ctrl PRODUCT_PACKAGES_DEBUG += trusty-ut-ctrl

5
dumpstate/DumpstateDevice.cpp
View file

@ -262,7 +262,6 @@ DumpstateDevice::DumpstateDevice()
{ "aoc", [this](int fd) { dumpAoCSection(fd); } }, { "aoc", [this](int fd) { dumpAoCSection(fd); } },
{ "misc", [this](int fd) { dumpMiscSection(fd); } }, { "misc", [this](int fd) { dumpMiscSection(fd); } },
{ "camera", [this](int fd) { dumpCameraSection(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()); CommandOptions::WithTimeout(4).Build());
} }
void DumpstateDevice::dumpTrustySection(int fd) {
DumpFileToFd(fd, "Trusty TEE0 Logs", "/dev/trusty-log0");
}
static void *dumpModemThread(void *data) { static void *dumpModemThread(void *data) {
std::string modemLogDir = MODEM_LOG_DIRECTORY; std::string modemLogDir = MODEM_LOG_DIRECTORY;
std::string extendedLogDir = MODEM_EXTENDED_LOG_DIRECTORY; std::string extendedLogDir = MODEM_EXTENDED_LOG_DIRECTORY;

1
dumpstate/DumpstateDevice.h
View file

@ -74,7 +74,6 @@ struct DumpstateDevice : public IDumpstateDevice {
void dumpAoCSection(int fd); void dumpAoCSection(int fd);
void dumpMiscSection(int fd); void dumpMiscSection(int fd);
void dumpCameraSection(int fd); void dumpCameraSection(int fd);
void dumpTrustySection(int fd);
}; };
} // namespace implementation } // namespace implementation

3
fingerprint/udfps_common.mk
View file

@ -14,9 +14,6 @@
# limitations under the License. # 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 # Fingerprint manifest
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
DEVICE_MANIFEST_FILE += \ DEVICE_MANIFEST_FILE += \

3
fingerprint/udfps_shipping.mk
View file

@ -14,5 +14,8 @@
# limitations under the License. # 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 += \ PRODUCT_PACKAGES += \
android.hardware.biometrics.fingerprint-service.goodix android.hardware.biometrics.fingerprint-service.goodix