diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-29 10:57:04 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-02-29 10:57:04 -0800 |
| commit | 2987cbcdaef9e14f635b6f9ac32c58ff26a2fc0f (patch) | |
| tree | f0d6f6180dbd2125193e5f884ae8bf3ad63695cc /llvm-device-build.mk | |
| parent | eeadbf034b24be2d902b9b6e2950a6e24145e587 (diff) | |
| parent | 8f698b54457858057e2849b43bdeeb4e912f8d3d (diff) | |
| download | external_llvm-2987cbcdaef9e14f635b6f9ac32c58ff26a2fc0f.zip external_llvm-2987cbcdaef9e14f635b6f9ac32c58ff26a2fc0f.tar.gz external_llvm-2987cbcdaef9e14f635b6f9ac32c58ff26a2fc0f.tar.bz2 | |
resolved conflicts for merge of 8f698b54 to master
Change-Id: Ie502ec01a03b2f9a8e015a2b83139f56fd84b91e
Diffstat (limited to 'llvm-device-build.mk')
| -rw-r--r-- | llvm-device-build.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/llvm-device-build.mk b/llvm-device-build.mk index 6c5ddd4..156a39b 100644 --- a/llvm-device-build.mk +++ b/llvm-device-build.mk @@ -20,6 +20,11 @@ LOCAL_CFLAGS := -DANDROID_TARGET_BUILD \ -fno-inline-functions-called-once \ $(LOCAL_CFLAGS) +ifeq ($(TARGET_BUILD_VARIANT),eng) +LOCAL_CFLAGS := -DANDROID_ENGINEERING_BUILD \ + $(LOCAL_CFLAGS) +endif + ifeq ($(LLVM_ENABLE_ASSERTION),true) LOCAL_CFLAGS := \ -D_DEBUG \ @@ -44,7 +49,7 @@ endif LOCAL_CPPFLAGS := \ $(LOCAL_CPPFLAGS) \ -Woverloaded-virtual \ - -Wno-sign-promo + -Wno-sign-promo # Make sure bionic is first so we can include system headers. LOCAL_C_INCLUDES := \ |