16kb: Set 16kb TARGET_ vars in BoardConfig files and targets
TARGET_ build variables MUST NOT be set up in device* files. In the device* files, the PRODUCT_ variables are not defined properly and only after the build system finishes parsing all the product files, we can set up TARGET_ vars based on PRODUCT_ vars. During the parsing of the BoardConfig files, the PRODUCT_ vars are defined and their values can not be changed. Test: Built and booted up `aosp_shiba` and and `aosp_shiba-pgagnostic` targets Bug: 370842132 Bug: 350529323 Bug: 346868433 Flag: EXEMPT bugfix Change-Id: Ic1da7f21b696f1659ef7d7b0b7089c3d2c03103e Merged-In: Ic1da7f21b696f1659ef7d7b0b7089c3d2c03103e
This commit is contained in:
parent
71af04af16
commit
c4818d8641
3 changed files with 7 additions and 11 deletions
|
@ -14,7 +14,11 @@
|
|||
# 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.
|
||||
TARGET_KERNEL_DIR_16K := $(TARGET_KERNEL_DIR)/16kb
|
||||
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
|
||||
endif
|
||||
|
||||
ifeq ($(PRODUCT_BOOTS_16K),true)
|
||||
TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
|
||||
TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb
|
||||
TARGET_RW_FILE_SYSTEM_TYPE := ext4
|
||||
else
|
||||
ifneq ($(TARGET_BOOTS_16K),true)
|
||||
PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION)
|
||||
endif
|
||||
|
||||
|
|
|
@ -24,11 +24,7 @@ TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_SHIBA_DIR)/kernel-headers
|
|||
|
||||
LOCAL_PATH := device/google/shusky
|
||||
|
||||
ifeq ($(PRODUCT_BOOTS_16K),true)
|
||||
TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
|
||||
TARGET_KERNEL_DIR := $(RELEASE_KERNEL_SHIBA_DIR)/16kb
|
||||
TARGET_RW_FILE_SYSTEM_TYPE := ext4
|
||||
else
|
||||
ifneq ($(TARGET_BOOTS_16K),true)
|
||||
PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION)
|
||||
endif
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue