commit 025218c7e4330a4942b14f9a8f1f68bd3390261c
author Elliott Hughes <enh@google.com> Tue Jul 30 17:13:06 2013 -0700
committer Elliott Hughes <enh@google.com> Tue Jul 30 17:13:06 2013 -0700
tree 8bfc33d0dcc9d5687845cea2c8d24a5020b1aa3a
parent 2724776ad521eebb1c7f0e4be56d6e6ab4764f86

Clean up stlport usage.

Change-Id: I133cd88f1da37f6f801a9e07a78ae23b671cf4f1

dalvikvm/Android.mk

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_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