diff options
| author | David Gross <dgross@google.com> | 2015-06-19 17:45:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-06-19 17:45:04 +0000 |
| commit | e428a2cde8a5a5aba99db38a7d7f6a0b7ee823d2 (patch) | |
| tree | f4998be53818b88884d54b3faf6a4bd7a685fa5c | |
| parent | 2855c3c524f4e6f62cdad38572f0729352f6b611 (diff) | |
| parent | 16f348349c181abd8a5c7f5e8c70ffdb38804dda (diff) | |
| download | clang-e428a2cde8a5a5aba99db38a7d7f6a0b7ee823d2.tar.gz | |
Merge "Replace LLVM_ENABLE_ASSERTION with FORCE_BUILD_LLVM_DISABLE_NDEBUG, and add FORCE_BUILD_LLVM_DEBUG."android-m-preview-1
| -rw-r--r-- | Android.mk | 13 | ||||
| -rw-r--r-- | clang-device-build.mk | 2 | ||||
| -rw-r--r-- | clang-host-build.mk | 8 |
3 files changed, 20 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index 4120a7c0f4..4faf6c5d48 100644 --- a/Android.mk +++ b/Android.mk @@ -1,6 +1,17 @@ LOCAL_PATH := $(call my-dir) CLANG_ROOT_PATH := $(LOCAL_PATH) -CLANG_ENABLE_ASSERTION := false + +FORCE_BUILD_LLVM_DISABLE_NDEBUG ?= false +# Legality check: FORCE_BUILD_LLVM_DISABLE_NDEBUG should consist of one word -- either "true" or "false". +ifneq "$(words $(FORCE_BUILD_LLVM_DISABLE_NDEBUG))$(words $(filter-out true false,$(FORCE_BUILD_LLVM_DISABLE_NDEBUG)))" "10" + $(error FORCE_BUILD_LLVM_DISABLE_NDEBUG may only be true, false, or unset) +endif + +FORCE_BUILD_LLVM_DEBUG ?= false +# Legality check: FORCE_BUILD_LLVM_DEBUG should consist of one word -- either "true" or "false". +ifneq "$(words $(FORCE_BUILD_LLVM_DEBUG))$(words $(filter-out true false,$(FORCE_BUILD_LLVM_DEBUG)))" "10" + $(error FORCE_BUILD_LLVM_DEBUG may only be true, false, or unset) +endif include $(CLEAR_VARS) diff --git a/clang-device-build.mk b/clang-device-build.mk index 28c7916f53..cc490e9579 100644 --- a/clang-device-build.mk +++ b/clang-device-build.mk @@ -8,7 +8,7 @@ LOCAL_CPPFLAGS := \ -Wno-sign-promo \ $(LOCAL_CPPFLAGS) -ifeq ($(CLANG_ENABLE_ASSERTION),true) +ifeq ($(FORCE_BUILD_LLVM_DISABLE_NDEBUG),true) LOCAL_CFLAGS := \ $(LOCAL_CFLAGS) \ -D_DEBUG \ diff --git a/clang-host-build.mk b/clang-host-build.mk index 3594cc4f85..9cd2bf4bbb 100644 --- a/clang-host-build.mk +++ b/clang-host-build.mk @@ -8,13 +8,19 @@ LOCAL_CPPFLAGS := \ -Wno-sign-promo \ $(LOCAL_CPPFLAGS) -ifeq ($(CLANG_ENABLE_ASSERTION),true) +ifeq ($(FORCE_BUILD_LLVM_DISABLE_NDEBUG),true) LOCAL_CFLAGS := \ $(LOCAL_CFLAGS) \ -D_DEBUG \ -UNDEBUG endif +ifeq ($(FORCE_BUILD_LLVM_DEBUG),true) +LOCAL_CFLAGS := \ + $(LOCAL_CFLAGS) \ + -O0 -g +endif + # Make sure bionic is first so we can include system headers. LOCAL_C_INCLUDES := \ $(CLANG_ROOT_PATH)/include \ |