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

Snap for 11959661 from 9634ba0f84 to 24Q3-release

Browse source 
Change-Id: If78318836807cbd1b0fa0f59acd55371a8a6628f
This commit is contained in:
Android Build Coastguard Worker 2024-06-12 23:02:24 +00:00
commit 73db47fe6f
4 changed files with 9 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
device.mk
View file

@ -40,6 +40,7 @@ include device/google/gs-common/betterbug/betterbug.mk
ifneq ($(filter oriole raven bluejay, $(TARGET_PRODUCT)),) ifneq ($(filter oriole raven bluejay, $(TARGET_PRODUCT)),)
include device/google/gs-common/bcmbt/dump/dumplog.mk include device/google/gs-common/bcmbt/dump/dumplog.mk
endif endif
include device/google/gs-common/fingerprint/fingerprint.mk
TARGET_BOARD_PLATFORM := gs101 TARGET_BOARD_PLATFORM := gs101
DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false) DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false)

2
device_framework_matrix_product.xml
View file

@ -78,7 +78,7 @@
</hal> </hal>
<hal format="aidl" optional="true"> <hal format="aidl" optional="true">
<name>com.google.hardware.pixel.display</name> <name>com.google.hardware.pixel.display</name>
<version>11-12</version> <version>12</version>
<interface> <interface>
<name>IDisplay</name> <name>IDisplay</name>
<instance>default</instance> <instance>default</instance>

18
pkvm/pkvm_enabler.c
View file

@ -24,7 +24,6 @@
#include <log/log.h> #include <log/log.h>
#define KVM_DEVICE "/dev/kvm"
#define MISC_WRITER "/vendor/bin/misc_writer" #define MISC_WRITER "/vendor/bin/misc_writer"
int main() { int main() {
@ -33,22 +32,7 @@ int main() {
pid_t pid; pid_t pid;
int ret, wstatus; int ret, wstatus;
/* Check whether KVM device exists. */ /* Run misc_writer and return FAILURE to force a reboot. */
ret = access(KVM_DEVICE, F_OK);
/* If KVM device exists, return SUCCESS to continue booting. */
if (ret == 0) {
exit(EXIT_SUCCESS);
}
if (ret != -ENOENT) {
ALOGW("Unexpected error from access(): %d", ret);
}
/*
* If KVM device does not exist, run misc_writer and return FAILURE
* to force a reboot.
*/
pid = fork(); pid = fork();
if (pid == -1) { if (pid == -1) {
ALOGE("Could not fork: %d", errno); ALOGE("Could not fork: %d", errno);

7
pkvm/pkvm_enabler.gs101.rc
View file

@ -2,5 +2,10 @@ service pkvm_enabler /vendor/bin/pkvm_enabler
reboot_on_failure reboot,pkvm-not-enabled reboot_on_failure reboot,pkvm-not-enabled
user root user root
on early-init # Old bootloaders do not set the protected_vm sysprop when pkvm is disabled
on early-init && property:ro.boot.hypervisor.protected_vm.supported=
exec_start pkvm_enabler
# New bootloaders set the protected_vm sysprop to 0 when pkvm is disabled
on early-init && property:ro.boot.hypervisor.protected_vm.supported=0
exec_start pkvm_enabler exec_start pkvm_enabler