From 61bda99af9d4558925fb9b32615263dadca1ac96 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Wed, 9 Mar 2022 11:01:54 +0000 Subject: [PATCH 1/5] handheld_core_hardware.xml should be included at device specific layer. Bug: 223543820 Test: Manual, verify build artifacts Change-Id: I22d8e3d599a4453fddc91541e622931ccd20f961 --- device.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/device.mk b/device.mk index 9c7e6713..9c121a98 100644 --- a/device.mk +++ b/device.mk @@ -918,8 +918,7 @@ $(call inherit-product-if-exists, vendor/google/camera/devices/whi/device-vendor PRODUCT_COPY_FILES += \ device/google/gs101/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \ - device/google/gs101/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml \ - frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \ + device/google/gs101/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml # modem_svc_sit daemon PRODUCT_PACKAGES += modem_svc_sit From 30c3ddacc7b9faec9045d73cfb803fbb9f40e44f Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 28 Jan 2022 14:02:14 -0800 Subject: [PATCH 2/5] gs101(uwb): rename uwb HAL Bug: 186585880 Test: Manual Tests Change-Id: If9da5e40b59f074c4ef410640cb921f1187bd114 --- device_framework_matrix_product.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index c4da7c13..e65f01ca 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -114,7 +114,7 @@ hardware.qorvo.uwb - IUwb + IUwbVendor default From 18bd11a39e5f48ff74386269d2628415c213fa18 Mon Sep 17 00:00:00 2001 From: Gina Ko Date: Fri, 25 Feb 2022 17:05:22 -0800 Subject: [PATCH 3/5] Refactor conditional to use DEVICE_IS_64BIT_ONLY Bug: 218458605 Bug: 223622655 Signed-off-by: Gina Ko Change-Id: Ia74ef39ab8433d036925a30217f49da8f6fd863b --- BoardConfig-common.mk | 4 +++- aosp_common.mk | 8 +++++--- device.mk | 9 +++++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 5038d378..1141a237 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -32,7 +32,9 @@ TARGET_CPU_ABI := arm64-v8a TARGET_CPU_VARIANT := cortex-a55 TARGET_CPU_VARIANT_RUNTIME := cortex-a55 -ifeq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT))) +DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)), true, false) + +ifneq ($(DEVICE_IS_64BIT_ONLY),true) TARGET_2ND_ARCH := arm TARGET_2ND_ARCH_VARIANT := armv8-a TARGET_2ND_CPU_ABI := armeabi-v7a diff --git a/aosp_common.mk b/aosp_common.mk index 57d67225..8788251a 100644 --- a/aosp_common.mk +++ b/aosp_common.mk @@ -17,10 +17,12 @@ # # All components inherited here go to system image # -ifeq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT))) -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -else +DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)), true, false) + +ifeq ($(DEVICE_IS_64BIT_ONLY),true) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) +else +$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) endif $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk) diff --git a/device.mk b/device.mk index 9c121a98..701b265c 100644 --- a/device.mk +++ b/device.mk @@ -17,8 +17,9 @@ include device/google/gs-common/device.mk TARGET_BOARD_PLATFORM := gs101 +DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)), true, false) -ifneq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT))) +ifeq ($(DEVICE_IS_64BIT_ONLY),true) LOCAL_64ONLY := _64 endif @@ -903,10 +904,10 @@ ifneq ($(BOARD_WITHOUT_RADIO),true) $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk) endif -ifeq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT))) -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -else +ifeq ($(DEVICE_IS_64BIT_ONLY),true) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) +else +$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) endif #$(call inherit-product, hardware/google_devices/exynos5/exynos5.mk) #$(call inherit-product-if-exists, hardware/google_devices/gs101/gs101.mk) From 4945c1e53089c0ab27f92961affb4facc168cd29 Mon Sep 17 00:00:00 2001 From: Midas Chien Date: Wed, 9 Mar 2022 21:10:21 +0800 Subject: [PATCH 4/5] display: make early wakeup node is readable Bug: 221384860 Test: cat node Change-Id: I917502071f1d308dd08874f44993389d6d2ecd09 --- conf/init.gs101.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc index 1a9859c6..4859d711 100644 --- a/conf/init.gs101.rc +++ b/conf/init.gs101.rc @@ -580,9 +580,9 @@ on fs chown system system /sys/class/dqe0/atc/gain_limit chown system system /sys/class/dqe0/atc/lt_calc_ab_shift chown system system /sys/devices/platform/1c300000.drmdecon/early_wakeup - chmod 0220 /sys/devices/platform/1c300000.drmdecon/early_wakeup + chmod 0660 /sys/devices/platform/1c300000.drmdecon/early_wakeup chown system system /sys/devices/platform/1c302000.drmdecon/early_wakeup - chmod 0220 /sys/devices/platform/1c302000.drmdecon/early_wakeup + chmod 0660 /sys/devices/platform/1c302000.drmdecon/early_wakeup # Copy DRM Key # copy /system/app/wv.keys /factory/wv.keys From d8a9805e9595e5c1412375624f7643a1dbbc431e Mon Sep 17 00:00:00 2001 From: Gina Ko Date: Mon, 14 Mar 2022 18:26:30 +0000 Subject: [PATCH 5/5] Fix typos Remove redundant spaces so the variable is set correctly Bug: 224556677 Test: Built R4 64bit Signed-off-by: Gina Ko Change-Id: Ide1f48cf04806234f637faea5edcd988403bafca --- BoardConfig-common.mk | 2 +- aosp_common.mk | 2 +- device.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 1141a237..f0a226a8 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -32,7 +32,7 @@ TARGET_CPU_ABI := arm64-v8a TARGET_CPU_VARIANT := cortex-a55 TARGET_CPU_VARIANT_RUNTIME := cortex-a55 -DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)), true, false) +DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false) ifneq ($(DEVICE_IS_64BIT_ONLY),true) TARGET_2ND_ARCH := arm diff --git a/aosp_common.mk b/aosp_common.mk index 8788251a..5ba98821 100644 --- a/aosp_common.mk +++ b/aosp_common.mk @@ -17,7 +17,7 @@ # # All components inherited here go to system image # -DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)), true, false) +DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false) ifeq ($(DEVICE_IS_64BIT_ONLY),true) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) diff --git a/device.mk b/device.mk index 701b265c..c3123b5a 100644 --- a/device.mk +++ b/device.mk @@ -17,7 +17,7 @@ include device/google/gs-common/device.mk 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) ifeq ($(DEVICE_IS_64BIT_ONLY),true) LOCAL_64ONLY := _64