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

Merge "Add support for TARGET_BOARD_INFO_FILES" into main am: 331fb9c708 am: 948d449316

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2755629

Change-Id: I8724a7fe8af9a7d89f39551ec965b02fab857d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-09-20 07:55:19 +00:00
committed by Automerger Merge Worker
parent d7ab5d122b 948d449316
commit 76da65c598
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
target/board/Android.mk
View File

@@ -10,15 +10,29 @@ LOCAL_PATH := $(call my-dir)
# device we're building for. This file is typically packaged up # device we're building for. This file is typically packaged up
# with everything else. # with everything else.
# #
# If TARGET_BOARD_INFO_FILE (which can be set in BoardConfig.mk) is # The following logic is used to find the contents of the info file:
# defined, it is used, otherwise board-info.txt is looked for in # 1. TARGET_BOARD_INFO_FILES (can be set in BoardConfig.mk) will be combined.
# $(TARGET_DEVICE_DIR). # 2. TARGET_BOARD_INFO_FILE (can be set in BoardConfig.mk) will be used.
# 3. $(TARGET_DEVICE_DIR)/board-info.txt will be used if present.
#
# Specifying both TARGET_BOARD_INFO_FILES and TARGET_BOARD_INFO_FILE is an
# error.
# #
INSTALLED_ANDROID_INFO_TXT_TARGET := $(PRODUCT_OUT)/android-info.txt INSTALLED_ANDROID_INFO_TXT_TARGET := $(PRODUCT_OUT)/android-info.txt
board_info_txt := $(TARGET_BOARD_INFO_FILE) ifdef TARGET_BOARD_INFO_FILES
ifndef board_info_txt ifdef TARGET_BOARD_INFO_FILE
board_info_txt := $(wildcard $(TARGET_DEVICE_DIR)/board-info.txt) $(warning Both TARGET_BOARD_INFO_FILES and TARGET_BOARD_INFO_FILE are defined.)
$(warning Using $(TARGET_BOARD_INFO_FILES) rather than $(TARGET_BOARD_INFO_FILE) for android-info.txt)
endif
board_info_txt := $(call intermediates-dir-for,PACKAGING,board-info)/board-info.txt
$(board_info_txt): $(TARGET_BOARD_INFO_FILES)
$(hide) cat $(TARGET_BOARD_INFO_FILES) > $@
else ifdef TARGET_BOARD_INFO_FILE
board_info_txt := $(TARGET_BOARD_INFO_FILE)
else
board_info_txt := $(wildcard $(TARGET_DEVICE_DIR)/board-info.txt)
endif endif
CHECK_RADIO_VERSIONS := $(HOST_OUT_EXECUTABLES)/check_radio_versions$(HOST_EXECUTABLE_SUFFIX) CHECK_RADIO_VERSIONS := $(HOST_OUT_EXECUTABLES)/check_radio_versions$(HOST_EXECUTABLE_SUFFIX)
$(INSTALLED_ANDROID_INFO_TXT_TARGET): $(board_info_txt) $(CHECK_RADIO_VERSIONS) $(INSTALLED_ANDROID_INFO_TXT_TARGET): $(board_info_txt) $(CHECK_RADIO_VERSIONS)
$(hide) $(CHECK_RADIO_VERSIONS) \ $(hide) $(CHECK_RADIO_VERSIONS) \