Merge "Turn on -Werror for LLVM builds."

[android-x86/external-llvm.git] / llvm-device-build.mk

diff --git a/llvm-device-build.mk b/llvm-device-build.mk
index 82ef055..627ad0c 100644 (file)
--- a/llvm-device-build.mk
+++ b/llvm-device-build.mk
@@ -13,6 +13,7 @@ LOCAL_CFLAGS :=       \
        -W      \
        -Wno-unused-parameter   \
        -Wwrite-strings \
+       -Werror \
         -Dsprintf=sprintf \
        $(LOCAL_CFLAGS)
 
@@ -28,7 +29,7 @@ LOCAL_CFLAGS := -DANDROID_ENGINEERING_BUILD \
                 $(LOCAL_CFLAGS)
 endif
 
-ifeq ($(LLVM_ENABLE_ASSERTION),true)
+ifeq ($(FORCE_BUILD_LLVM_DISABLE_NDEBUG),true)
 LOCAL_CFLAGS :=        \
        $(LOCAL_CFLAGS) \
        -D_DEBUG        \
@@ -58,7 +59,6 @@ LOCAL_CPPFLAGS :=     \
 # Make sure bionic is first so we can include system headers.
 LOCAL_C_INCLUDES :=    \
        bionic \
-       external/libcxx/include \
        $(LLVM_ROOT_PATH)       \
        $(LLVM_ROOT_PATH)/include       \
        $(LLVM_ROOT_PATH)/device/include        \