Snap for 11840485 from ddec229eb1 to 24Q3-release

Change-Id: I9dfacf15d037f829ef2cf73d0101a7bdf38257c6
This commit is contained in:
Android Build Coastguard Worker 2024-05-14 23:03:20 +00:00
commit cfb2939784
4 changed files with 15 additions and 2 deletions

View file

@ -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)

View file

@ -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)

View file

@ -48,7 +48,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

View file

@ -48,7 +48,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