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

Commit c11b5efa authored by Joe Onorato's avatar Joe Onorato Committed by android code review
Browse files

Merge "Should have been included in 74e883d1"

parents c22da7d7 e35a445f

core/main.mk

+7 −7
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ include $(BUILD_SYSTEM)/config.mk 
# be generated correctly

include $(BUILD_SYSTEM)/cleanbuild.mk



VERSION_CHECK_SEQUENCE_NUMBER := 2

VERSION_CHECK_SEQUENCE_NUMBER := 3

-include $(OUT_DIR)/versions_checked.mk

ifneq ($(VERSION_CHECK_SEQUENCE_NUMBER),$(VERSIONS_CHECKED))
@@ -162,12 +162,10 @@ GCC_REALPATH = $(realpath $(shell which gcc)) 
ifneq ($(findstring llvm-gcc,$(GCC_REALPATH)),)

  # Using LLVM GCC results in a non functional emulator due to it

  # not honouring global register variables

  ifneq ($(strip $(BUILD_EMULATOR)),)

  $(warning ****************************************)

  $(warning * gcc is linked to llvm-gcc which will *)

  $(warning * not create a useable emulator.       *)

  $(warning ****************************************)

  endif

  BUILD_EMULATOR := false

else

  BUILD_EMULATOR := true
@@ -193,6 +191,8 @@ endif 


$(shell echo 'VERSIONS_CHECKED := $(VERSION_CHECK_SEQUENCE_NUMBER)' \

        > $(OUT_DIR)/versions_checked.mk)

$(shell echo 'BUILD_EMULATOR := $(BUILD_EMULATOR)' \

        >> $(OUT_DIR)/versions_checked.mk)

endif



# These are the modifier targets that don't do anything themselves, but