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

Commit f363df8d authored by Steve Kondik's avatar Steve Kondik
Browse files

build: Clean up use of vendor/extra 

 * extra_config.mk is not needed anymore
 * Include BoardConfigExtra.mk if available

Change-Id: Icd0db0852ceee5cb5c701c9a40b829e1f3ebd69e
parent 8907b775

core/config.mk

+1 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ comma := , 
# only has an effect on python 2.6 and above.

export PYTHONDONTWRITEBYTECODE := 1



-include $(TOPDIR)vendor/extra/extra_config.mk



# Standard source directories.

SRC_DOCS:= $(TOPDIR)docs

# TODO: Enforce some kind of layering; only add include paths
@@ -158,6 +156,7 @@ ifneq ($(words $(board_config_mk)),1) 
  $(error Multiple board config files for TARGET_DEVICE $(TARGET_DEVICE): $(board_config_mk))

endif

include $(board_config_mk)

-include vendor/extra/BoardConfigExtra.mk

ifeq ($(TARGET_ARCH),)

  $(error TARGET_ARCH not defined by board config: $(board_config_mk))

endif

core/dumpvar.mk

+4 −0
Original line number Diff line number Diff line
@@ -106,5 +106,9 @@ $(info HOST_OS_EXTRA=$(HOST_OS_EXTRA)) 
$(info   HOST_BUILD_TYPE=$(HOST_BUILD_TYPE))

$(info   BUILD_ID=$(BUILD_ID))

$(info   OUT_DIR=$(OUT_DIR))

ifeq ($(CYNGN_TARGET),true)

$(info   CYNGN_TARGET=$(CYNGN_TARGET))

$(info   CYNGN_FEATURES=$(CYNGN_FEATURES))

endif

$(info ============================================)

endif

core/main.mk

+0 −4
Original line number Diff line number Diff line
@@ -107,9 +107,6 @@ include $(BUILD_SYSTEM)/qcom_utils.mk 
# Include the google-specific config

-include vendor/google/build/config.mk



# Include the extra device config

-include vendor/extra/device.mk



VERSION_CHECK_SEQUENCE_NUMBER := 3

-include $(OUT_DIR)/versions_checked.mk

ifneq ($(VERSION_CHECK_SEQUENCE_NUMBER),$(VERSIONS_CHECKED))
@@ -486,7 +483,6 @@ GET-INSTALL-PATH: 
		echo 'INSTALL-PATH: $(m) $(ALL_MODULES.$(m).INSTALLED)';))



else # ONE_SHOT_MAKEFILE



ifneq ($(dont_bother),true)

#

# Include all of the makefiles in the system