From 6e246c5334be2d622552236ce4977f2755858cae Mon Sep 17 00:00:00 2001 From: Alexander Koskovich Date: Sun, 12 May 2024 07:32:26 -0400 Subject: [PATCH 1/2] Update LOCAL_CERTIFICATE to PRESIGNED for ShannonRcs Test: No more denials when it tries to find IOemSlsiRadioExternal. Change-Id: I01f8d8fc3262909400ab1c6598017d045ba27625 --- self-extractors_husky/google_devices/staging/Android.mk | 2 +- self-extractors_shiba/google_devices/staging/Android.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/self-extractors_husky/google_devices/staging/Android.mk b/self-extractors_husky/google_devices/staging/Android.mk index a3a6f13..e5bcec2 100644 --- a/self-extractors_husky/google_devices/staging/Android.mk +++ b/self-extractors_husky/google_devices/staging/Android.mk @@ -64,7 +64,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE diff --git a/self-extractors_shiba/google_devices/staging/Android.mk b/self-extractors_shiba/google_devices/staging/Android.mk index 124f68a..dbef8e5 100644 --- a/self-extractors_shiba/google_devices/staging/Android.mk +++ b/self-extractors_shiba/google_devices/staging/Android.mk @@ -64,7 +64,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE From 9ba0df13009c57a5d058af38320b07a4256d7638 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Mon, 13 May 2024 17:13:50 -0700 Subject: [PATCH 2/2] 16kb: Configure the file system and kernel for pgagnostic targets Test: $ source build/envsetup.sh $ lunch husky_pgagnostic-trunk_staging-userdebug $ get_build_var TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE ext4 $ get_build_var TARGET_KERNEL_DIR device/google/shusky-kernels/5.15/trunk-11828503/16kb Bug: 333734531 Bug: 308663811 Change-Id: I8d69e4df68303351a9d402c4d458061c72499cd7 --- device-husky.mk | 6 ++++++ device-shiba.mk | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index 0cf8269..dbf08ce 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -31,6 +31,12 @@ ifeq ($(filter factory_husky, $(TARGET_PRODUCT)),) include device/google/shusky/uwb/uwb_calibration.mk endif +DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false) + +ifeq ($(DEVICE_PAGE_AGNOSTIC),true) +TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 +TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb +endif $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-husky.mk) $(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/device-vendor.mk) diff --git a/device-shiba.mk b/device-shiba.mk index 72b9902..b7f3371 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -24,6 +24,13 @@ TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_SHIBA_DIR)/kernel-headers LOCAL_PATH := device/google/shusky +DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false) + +ifeq ($(DEVICE_PAGE_AGNOSTIC),true) +TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 +TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb +endif + $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-shiba.mk) $(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-vendor.mk)