diff options
| author | Elliott Hughes <enh@google.com> | 2013-07-30 17:13:06 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-07-30 17:13:06 -0700 |
| commit | 025218c7e4330a4942b14f9a8f1f68bd3390261c (patch) | |
| tree | 8bfc33d0dcc9d5687845cea2c8d24a5020b1aa3a /dalvikvm | |
| parent | 2724776ad521eebb1c7f0e4be56d6e6ab4764f86 (diff) | |
| download | art-025218c7e4330a4942b14f9a8f1f68bd3390261c.zip art-025218c7e4330a4942b14f9a8f1f68bd3390261c.tar.gz art-025218c7e4330a4942b14f9a8f1f68bd3390261c.tar.bz2 | |
Clean up stlport usage.
Change-Id: I133cd88f1da37f6f801a9e07a78ae23b671cf4f1
Diffstat (limited to 'dalvikvm')
| -rw-r--r-- | dalvikvm/Android.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk index 5e5e40c..d85d5fb 100644 --- a/dalvikvm/Android.mk +++ b/dalvikvm/Android.mk @@ -16,13 +16,15 @@ LOCAL_PATH := $(call my-dir) +dalvikvm_cflags := -Wall -Werror -Wextra + include $(CLEAR_VARS) LOCAL_MODULE := dalvikvm LOCAL_MODULE_TAGS := optional LOCAL_CPP_EXTENSION := cc LOCAL_SRC_FILES := dalvikvm.cc -LOCAL_CFLAGS := -Werror -LOCAL_SHARED_LIBRARIES := libnativehelper libstlport libdl +LOCAL_CFLAGS := $(dalvikvm_cflags) +LOCAL_SHARED_LIBRARIES := libdl libnativehelper LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include external/stlport/libstlport.mk include $(BUILD_EXECUTABLE) @@ -33,7 +35,7 @@ LOCAL_MODULE := dalvikvm LOCAL_MODULE_TAGS := optional LOCAL_CPP_EXTENSION := cc LOCAL_SRC_FILES := dalvikvm.cc -LOCAL_CFLAGS := -Werror +LOCAL_CFLAGS := $(dalvikvm_cflags) LOCAL_SHARED_LIBRARIES := libnativehelper LOCAL_LDFLAGS := -ldl LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk |