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

Commit 8c1eeffe authored by Brian Swetland's avatar Brian Swetland Committed by Android Git Automerger
Browse files

am 2b80317b: only auto-generate board= requirement if a board-info file is not specified 

Merge commit '2b80317b' into eclair-mr2

* commit '2b80317b':
  only auto-generate board= requirement if a board-info file is not specified
parents 69ed23d0 2b80317b

target/board/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ INSTALLED_ANDROID_INFO_TXT_TARGET := $(PRODUCT_OUT)/android-info.txt 
board_info_txt := $(wildcard $(TARGET_DEVICE_DIR)/board-info.txt)

$(INSTALLED_ANDROID_INFO_TXT_TARGET): $(board_info_txt)

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

	$(hide) echo "board=$(TARGET_BOOTLOADER_BOARD_NAME)" > $@

ifdef board_info_txt

	$(hide) cat $< >> $@

else

	$(hide) echo "board=$(TARGET_BOOTLOADER_BOARD_NAME)" > $@

endif