Snap for 11847214 from 89d2eccd64
to 24Q3-release
Change-Id: I073b91fea2963d85cd48c353417f05a4c86418b0
This commit is contained in:
commit
764f994f9b
5 changed files with 9 additions and 7 deletions
|
@ -36,6 +36,7 @@ DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false
|
||||||
ifeq ($(DEVICE_PAGE_AGNOSTIC),true)
|
ifeq ($(DEVICE_PAGE_AGNOSTIC),true)
|
||||||
TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
|
TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
|
||||||
TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb
|
TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb
|
||||||
|
TARGET_RW_FILE_SYSTEM_TYPE := ext4
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-husky.mk)
|
$(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-husky.mk)
|
||||||
|
|
|
@ -28,7 +28,8 @@ DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false
|
||||||
|
|
||||||
ifeq ($(DEVICE_PAGE_AGNOSTIC),true)
|
ifeq ($(DEVICE_PAGE_AGNOSTIC),true)
|
||||||
TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
|
TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
|
||||||
TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb
|
TARGET_KERNEL_DIR := $(RELEASE_KERNEL_SHIBA_DIR)/16kb
|
||||||
|
TARGET_RW_FILE_SYSTEM_TYPE := ext4
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-shiba.mk)
|
$(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-shiba.mk)
|
||||||
|
|
|
@ -28,9 +28,9 @@ TARGET_BOOTLOADER_BOARD_NAME := husky
|
||||||
|
|
||||||
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR)
|
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR)
|
||||||
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR)
|
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR)
|
||||||
RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR ?= trunk # Keep this for pdk TODO: b/327119000
|
RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR ?= pdk# Keep this for pdk TODO: b/327119000
|
||||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR)
|
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR)
|
||||||
$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR))
|
$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR))
|
||||||
|
|
||||||
ifdef PHONE_CAR_BOARD_PRODUCT
|
ifdef PHONE_CAR_BOARD_PRODUCT
|
||||||
include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
|
include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
|
||||||
|
|
|
@ -27,9 +27,9 @@ TARGET_SCREEN_DENSITY := 440
|
||||||
BOARD_USES_GENERIC_AUDIO := true
|
BOARD_USES_GENERIC_AUDIO := true
|
||||||
USES_DEVICE_GOOGLE_SHUSKY := true
|
USES_DEVICE_GOOGLE_SHUSKY := true
|
||||||
|
|
||||||
RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR ?= trunk # Keep this for pdk TODO: b/327119000
|
RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR ?= pdk# Keep this for pdk TODO: b/327119000
|
||||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR)
|
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR)
|
||||||
$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR))
|
$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR))
|
||||||
|
|
||||||
include device/google/shusky/device-shusky-common.mk
|
include device/google/shusky/device-shusky-common.mk
|
||||||
|
|
||||||
|
|
|
@ -28,9 +28,9 @@ TARGET_BOOTLOADER_BOARD_NAME := shiba
|
||||||
|
|
||||||
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR)
|
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR)
|
||||||
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR)
|
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR)
|
||||||
RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR ?= trunk # Keep this for pdk TODO: b/327119000
|
RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR ?= pdk# Keep this for pdk TODO: b/327119000
|
||||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR)
|
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR)
|
||||||
$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR))
|
$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR))
|
||||||
|
|
||||||
ifdef PHONE_CAR_BOARD_PRODUCT
|
ifdef PHONE_CAR_BOARD_PRODUCT
|
||||||
include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
|
include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue