diff options
| author | Joe Onorato <joeo@google.com> | 2012-07-25 17:56:24 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-07-25 17:56:24 -0700 |
| commit | c11b5efa3a20e2364dfffbfa205306b9bd2e538a (patch) | |
| tree | 54054a97499cd69cfddffdc143bdcaa9da5440ab | |
| parent | c22da7d7e2de0b4cbeefb533990d81581d19432a (diff) | |
| parent | e35a445f2f7b32e39d88e0ba58b120aae6807baf (diff) | |
| download | build-c11b5efa3a20e2364dfffbfa205306b9bd2e538a.zip build-c11b5efa3a20e2364dfffbfa205306b9bd2e538a.tar.gz build-c11b5efa3a20e2364dfffbfa205306b9bd2e538a.tar.bz2 | |
Merge "Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb"
| -rw-r--r-- | core/main.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/main.mk b/core/main.mk index 2083887..d0b277c 100644 --- a/core/main.mk +++ b/core/main.mk @@ -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 + $(warning ****************************************) + $(warning * gcc is linked to llvm-gcc which will *) + $(warning * not create a useable emulator. *) + $(warning ****************************************) 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 |