Merge "changes to bring up homescreen on Ripcurrent"

This commit is contained in:
TreeHugger Robot 2022-07-03 23:52:40 +00:00 committed by Android (Google) Code Review
commit 8619c4701a
4 changed files with 52 additions and 15 deletions

View file

@ -104,7 +104,8 @@ BOARD_EGL_CFG := device/google/zuma/conf/egl.cfg
USE_OPENGL_RENDERER := true
NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
BOARD_USES_EXYNOS5_COMMON_GRALLOC := true
BOARD_USES_EXYNOS_GRALLOC_VERSION := $(DEVICE_USES_EXYNOS_GRALLOC_VERSION)
BOARD_USES_EXYNOS_GRALLOC_VERSION := 4
#BOARD_USES_EXYNOS_GRALLOC_VERSION := $(DEVICE_USES_EXYNOS_GRALLOC_VERSION)
BOARD_USES_ALIGN_RESTRICTION := false
BOARD_USES_GRALLOC_ION_SYNC := true
@ -339,14 +340,15 @@ BOARD_VNDK_VERSION := current
BOARD_EXYNOS_S10B_FORMAT_ALIGN := 64
# NeuralNetworks
GPU_SOURCE_PRESENT := $(wildcard vendor/arm/mali/valhall)
GPU_PREBUILD_PRESENT := $(wildcard vendor/google_devices/zebu/prebuilts/libs)
#GPU_SOURCE_PRESENT := $(wildcard vendor/arm/mali/valhall)
#GPU_PREBUILD_PRESENT := $(wildcard vendor/google_devices/zebu/prebuilts/libs)
ifneq (,$(strip $(GPU_SOURCE_PRESENT) $(GPU_PREBUILD_PRESENT)))
ARMNN_COMPUTE_CL_ENABLE := 1
else
ARMNN_COMPUTE_CL_ENABLE := 0
endif
ARMNN_COMPUTE_NEON_ENABLE := 1
ARMNN_COMPUTE_CL_ENABLE := 0
# Boot.img
BOARD_RAMDISK_USE_LZ4 := true

View file

@ -56,6 +56,9 @@ PRODUCT_SOONG_NAMESPACES += \
LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
# thermal control disable
PRODUCT_PROPERTY_OVERRIDES += vendor.disable.thermal.control=1
# OEM Unlock reporting
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
ro.oem_unlock_supported=1
@ -163,7 +166,7 @@ endif
ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
# Audio client implementation for RIL
USES_GAUDIO := true
USES_GAUDIO := false
endif
# ######################
@ -260,7 +263,7 @@ DEVICE_PACKAGE_OVERLAYS += device/google/zuma/overlay
PRODUCT_SHIPPING_API_LEVEL := 32
# RKP VINTF
-include vendor/google_nos/host/android/hals/keymaster/aidl/strongbox/RemotelyProvisionedComponent-citadel.mk
#-include vendor/google_nos/host/android/hals/keymaster/aidl/strongbox/RemotelyProvisionedComponent-citadel.mk
# Enforce the Product interface
PRODUCT_PRODUCT_VNDK_VERSION := current
@ -398,7 +401,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += android.hardware.sensors@2.1-service.multihal
# USB HAL
PRODUCT_PACKAGES += \
#PRODUCT_PACKAGES += \
android.hardware.usb-service
PRODUCT_PACKAGES += \
android.hardware.usb.gadget-service
@ -441,13 +444,13 @@ include device/google/zuma/aoc/device.mk
#
# Audio Configurations
USE_LEGACY_LOCAL_AUDIO_HAL := false
USE_XML_AUDIO_POLICY_CONF := 1
#USE_LEGACY_LOCAL_AUDIO_HAL := false
#USE_XML_AUDIO_POLICY_CONF := 1
# Enable AAudio MMAP/NOIRQ data path.
PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_policy=2
PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_exclusive_policy=2
PRODUCT_PROPERTY_OVERRIDES += aaudio.hw_burst_min_usec=2000
#PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_policy=2
#PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_exclusive_policy=2
#PRODUCT_PROPERTY_OVERRIDES += aaudio.hw_burst_min_usec=2000
# Calliope firmware overwrite
#PRODUCT_COPY_FILES += \
@ -753,9 +756,12 @@ endif
# TODO[b/XXXX]: Re-enable Trusty and disable this when Trusty is working
PRODUCT_PACKAGES += \
android.hardware.keymaster@4.1-service \
android.hardware.gatekeeper@1.0-service.software
android.hardware.gatekeeper@1.0-service.remote
# android.hardware.gatekeeper@1.0-service.software
LOCAL_KEYMASTER_PRODUCT_PACKAGE := android.hardware.keymaster@4.1-service
LOCAL_GATEKEEPER_PRODUCT_PACKAGE := android.hardware.gatekeeper@1.0-service.software
#LOCAL_GATEKEEPER_PRODUCT_PACKAGE := android.hardware.gatekeeper@1.0-service.software
LOCAL_GATEKEEPER_PRODUCT_PACKAGE := android.hardware.gatekeeper@1.0-service.remote
# Trusty (KM, GK, Storage)
#$(call inherit-product, system/core/trusty/trusty-storage.mk)
@ -1040,8 +1046,13 @@ include device/google/gs101/telephony/pktrouter.mk
include hardware/google/pixel/thermal/device.mk
PRODUCT_PROPERTY_OVERRIDES += persist.vendor.enable.thermal.genl=true
# To prevent rebooting due to crashing services
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
init.svc_debug.no_fatal.zygote=true \
persist.device_config.configuration.disable_rescue_party=true
## TPU packages
include device/google/zuma/edgetpu/edgetpu.mk
#include device/google/zuma/edgetpu/edgetpu.mk
# Connectivity Thermal Power Manager
PRODUCT_PACKAGES += \

View file

@ -18,6 +18,7 @@ $(call inherit-product, device/google/zuma/aosp_common.mk)
$(call inherit-product-if-exists, vendor/google_devices/zuma/factory/pixel/device-factory.mk)
PRODUCT_PROPERTY_OVERRIDES += service.adb.root=1 \
vendor.disable.thermal.control=1 \
ro.vendor.factory=1
# Factory Libraries of Audio

View file

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright (c) 2009, The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
<resources>
<!-- Don't enable BT until user wants it -->
<bool name="def_bluetooth_on">false</bool>
</resources>