16kb: Set 16kb TARGET_ vars in BoardConfig files and targets am: c4818d8641
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/3311723 Change-Id: Iaa820ad02ebc5693a2d901fc0e8626b02119757b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
420aebdc50
3 changed files with 7 additions and 11 deletions
|
@ -14,7 +14,11 @@
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
|
||||||
ifeq ($(PRODUCT_16K_DEVELOPER_OPTION),true)
|
ifeq ($(TARGET_BOOTS_16K),true)
|
||||||
|
# Configures the 16kb kernel directory.
|
||||||
|
TARGET_KERNEL_DIR := $(TARGET_KERNEL_DIR)/16kb
|
||||||
|
|
||||||
|
else ifeq ($(PRODUCT_16K_DEVELOPER_OPTION),true)
|
||||||
# Configures the 16kb kernel and modules for OTA updates.
|
# Configures the 16kb kernel and modules for OTA updates.
|
||||||
TARGET_KERNEL_DIR_16K := $(TARGET_KERNEL_DIR)/16kb
|
TARGET_KERNEL_DIR_16K := $(TARGET_KERNEL_DIR)/16kb
|
||||||
BOARD_KERNEL_PATH_16K := $(TARGET_KERNEL_DIR_16K)/Image.lz4
|
BOARD_KERNEL_PATH_16K := $(TARGET_KERNEL_DIR_16K)/Image.lz4
|
||||||
|
|
|
@ -31,11 +31,7 @@ ifeq ($(filter factory_husky, $(TARGET_PRODUCT)),)
|
||||||
include device/google/shusky/uwb/uwb_calibration.mk
|
include device/google/shusky/uwb/uwb_calibration.mk
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(PRODUCT_BOOTS_16K),true)
|
ifneq ($(TARGET_BOOTS_16K),true)
|
||||||
TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
|
|
||||||
TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb
|
|
||||||
TARGET_RW_FILE_SYSTEM_TYPE := ext4
|
|
||||||
else
|
|
||||||
PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION)
|
PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -24,11 +24,7 @@ TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_SHIBA_DIR)/kernel-headers
|
||||||
|
|
||||||
LOCAL_PATH := device/google/shusky
|
LOCAL_PATH := device/google/shusky
|
||||||
|
|
||||||
ifeq ($(PRODUCT_BOOTS_16K),true)
|
ifneq ($(TARGET_BOOTS_16K),true)
|
||||||
TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
|
|
||||||
TARGET_KERNEL_DIR := $(RELEASE_KERNEL_SHIBA_DIR)/16kb
|
|
||||||
TARGET_RW_FILE_SYSTEM_TYPE := ext4
|
|
||||||
else
|
|
||||||
PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION)
|
PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue