StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make change and version bump to QP1A.190526.001

Browse Source 
Change-Id: I498bbc60a1a112b38c97aefd055bdf7f437acc7a
This commit is contained in:
android-build-team Robot
2019-05-25 23:16:36 +00:00
parent 9466226aa7 f862715103
commit 53b09b43d0
7 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/Makefile
View File

@@ -567,7 +567,7 @@ endif # BOARD_USES_PRODUCTIMAGE
# ----------------------------------------------------------------
# odm build.prop
INSTALLED_ODM_BUILD_PROP_TARGET := $(TARGET_OUT_ODM)/build.prop
INSTALLED_ODM_BUILD_PROP_TARGET := $(TARGET_OUT_ODM)/etc/build.prop
ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_ODM_BUILD_PROP_TARGET)
FINAL_ODM_BUILD_PROPERTIES += \
@@ -862,12 +862,13 @@ $(call dist-for-goals, sdk win_sdk sdk_addon, $(INSTALLED_FILES_FILE_ROOT))
#------------------------------------------------------------------
# dtb
ifdef BOARD_PREBUILT_DTBIMAGE_DIR
ifdef BOARD_INCLUDE_DTB_IN_BOOTIMG
INSTALLED_DTBIMAGE_TARGET := $(PRODUCT_OUT)/dtb.img
ifdef BOARD_PREBUILT_DTBIMAGE_DIR
$(INSTALLED_DTBIMAGE_TARGET) : $(sort $(wildcard $(BOARD_PREBUILT_DTBIMAGE_DIR)/*.dtb))
cat $^ > $@
endif
endif
# -----------------------------------------------------------------
# the ramdisk
@@ -3791,6 +3792,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \
$(INTERNAL_SYSTEMOTHERIMAGE_FILES) \
$(INSTALLED_ANDROID_INFO_TXT_TARGET) \
$(INSTALLED_KERNEL_TARGET) \
$(INSTALLED_DTBIMAGE_TARGET) \
$(INSTALLED_2NDBOOTLOADER_TARGET) \
$(BOARD_PREBUILT_DTBOIMAGE) \
$(BOARD_PREBUILT_RECOVERY_DTBOIMAGE) \
@@ -3843,7 +3845,7 @@ endif
ifdef BOARD_INCLUDE_RECOVERY_ACPIO
$(hide) cp $(BOARD_RECOVERY_ACPIO) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/recovery_acpio
endif
ifdef BOARD_INCLUDE_DTB_IN_BOOTIMG
ifdef INSTALLED_DTBIMAGE_TARGET
$(hide) cp $(INSTALLED_DTBIMAGE_TARGET) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/dtb
endif
ifdef INTERNAL_KERNEL_CMDLINE

6
core/board_config.mk
View File

@@ -482,6 +482,12 @@ ifeq ($(AB_OTA_UPDATER),true)
endif
endif
ifdef BOARD_PREBUILT_DTBIMAGE_DIR
ifneq ($(BOARD_INCLUDE_DTB_IN_BOOTIMG),true)
$(error BOARD_PREBUILT_DTBIMAGE_DIR with 'BOARD_INCLUDE_DTB_IN_BOOTIMG != true' is not supported)
endif
endif
# Check BOARD_VNDK_VERSION
define check_vndk_version
$(eval vndk_path := prebuilts/vndk/v$(1)) \

2
core/build_id.mk
View File

@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
BUILD_ID=QP1A.190523.001
BUILD_ID=QP1A.190526.001