Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc31d76b authored by Ying Wang's avatar Ying Wang
Browse files

Use TARGET_BOARD_INFO_FILE to locate board-info.txt 

So board-info.txt can be inherited from the parent device.

Change-Id: I5d99a2483b9a325e475f3c602d9e0f5d2b95e80c
parent 8bfaa68b

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -94,6 +94,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libstagefright_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libstagefright_omx_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/librtp_jni_intermediates)



$(call add-clean-step, rm -rf $(PRODUCT_OUT)/android-info.txt)

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

target/board/Android.mk

+5 −1
Original line number Diff line number Diff line
@@ -27,10 +27,14 @@ endif 
# with everything else.

#

# If the file "board-info.txt" appears in $(TARGET_DEVICE_DIR),

# it will be appended to the output file.

# it will be used; otherwise TARGET_BOARD_INFO_FILE is used, which

# can be set in BoardConfig.mk.

#

INSTALLED_ANDROID_INFO_TXT_TARGET := $(PRODUCT_OUT)/android-info.txt

board_info_txt := $(wildcard $(TARGET_DEVICE_DIR)/board-info.txt)

ifndef board_info_txt

board_info_txt := $(TARGET_BOARD_INFO_FILE)

endif

$(INSTALLED_ANDROID_INFO_TXT_TARGET): $(board_info_txt)

	$(call pretty,"Generated: ($@)")

ifdef board_info_txt