summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BoardConfig-common.mk5
-rw-r--r--conf/init.gs201.rc6
-rw-r--r--device.mk5
-rw-r--r--manifest.xml8
4 files changed, 6 insertions, 18 deletions
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index bb2910a..c599bf6 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -36,7 +36,7 @@ TARGET_CPU_VARIANT_RUNTIME := cortex-a55
ZYGOTE_FORCE_64 := true
# Force any prefer32 targets to be compiled as 64 bit.
-FORCE_MULTILIB_FIRST_ON_DEVICE := true
+IGNORE_PREFER32_ON_DEVICE := true
# Build the 32 bit targets
TARGET_2ND_ARCH := arm
@@ -376,9 +376,6 @@ BOARD_DTBOIMG_PARTITION_SIZE := 0x01000000
# Build vendor kernel boot image
BOARD_VENDOR_KERNEL_BOOTIMAGE_PARTITION_SIZE := 0x04000000
-# System As Root
-BOARD_BUILD_SYSTEM_ROOT_IMAGE := false
-
# Vendor ramdisk image for kernel development
BOARD_BUILD_VENDOR_RAMDISK_IMAGE := true
diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index cebd881..56b9e1b 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -262,6 +262,9 @@ on init
# Adaptive charge
chown system system /sys/class/power_supply/battery/charge_deadline
+ # Charging policy
+ chown system system /sys/class/power_supply/battery/charging_policy
+
# Battery Defender
chown system system /sys/devices/platform/google,battery/power_supply/battery/bd_trickle_cnt
chown system system /sys/devices/platform/google,battery/power_supply/battery/bd_trickle_dry_run
@@ -322,9 +325,6 @@ on init
write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu7_memlat@17000010/mem_latency/ratio_ceil 3200
on late-fs
- # Wait for keymaster HALs
- exec_start wait_for_keymaster
-
# Start bootanimation class before mount
start bootanim
class_start animation
diff --git a/device.mk b/device.mk
index 883eb3a..480c28f 100644
--- a/device.mk
+++ b/device.mk
@@ -559,10 +559,8 @@ PRODUCT_PACKAGES += BrownoutDetection
endif
PRODUCT_PACKAGES_DEBUG += \
- sg_write_buffer \
f2fs_io \
check_f2fs \
- f2fsstat \
f2fs.fibmap \
dump.f2fs
@@ -814,6 +812,7 @@ PRODUCT_PACKAGES += \
#PRODUCT_PACKAGES += \
# trusty_metricsd
+$(call soong_config_set,google_displaycolor,displaycolor_platform,gs201)
PRODUCT_PACKAGES += \
android.hardware.composer.hwc3-service.pixel \
libdisplaycolor
@@ -861,7 +860,7 @@ PRODUCT_COPY_FILES += \
# fastbootd
PRODUCT_PACKAGES += \
- android.hardware.fastboot@1.1-impl.pixel \
+ android.hardware.fastboot-service.pixel_recovery \
fastbootd
#google iwlan
diff --git a/manifest.xml b/manifest.xml
index 4b2f666..902aaa6 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -64,14 +64,6 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="aidl">
- <name>vendor.google.google_battery</name>
- <version>1</version>
- <interface>
- <name>IGoogleBattery</name>
- <instance>default</instance>
- </interface>
- </hal>
<hal format="hidl">
<name>vendor.google.whitechapel.audio.audioext</name>
<transport>hwbinder</transport>