diff options
| author | Joe Onorato <joeo@google.com> | 2012-07-25 22:24:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-25 22:24:02 -0700 |
| commit | 2dd9902cf965f7662eff9e84c5c8d47c3f7536af (patch) | |
| tree | 86eec01414d99965ce8c7267fb714f4488b40267 /core/main.mk | |
| parent | 42f0127a068ecb540dc98dea23932e074d127b20 (diff) | |
| parent | 4ae631f4560d383c28767641bb7e9e47ab175c7f (diff) | |
| download | build-2dd9902cf965f7662eff9e84c5c8d47c3f7536af.zip build-2dd9902cf965f7662eff9e84c5c8d47c3f7536af.tar.gz build-2dd9902cf965f7662eff9e84c5c8d47c3f7536af.tar.bz2 | |
am 4ae631f4: am c11b5efa: Merge "Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb"
* commit '4ae631f4560d383c28767641bb7e9e47ab175c7f':
Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb
Diffstat (limited to 'core/main.mk')
| -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 56978c9..21e2e7f 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 |