aboutsummaryrefslogtreecommitdiff
path: root/dexopt
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2011-06-07 10:07:11 -0700
committerElliott Hughes <enh@google.com>2011-06-07 10:35:59 -0700
commit0fbb7030fff58e25718291811394487d95d95a3e (patch)
tree650e3392586af843c61e6a04d5b38303ae3ed1f8 /dexopt
parent0bb39c2258a1e45bb1142ec89b8ca5d2eaaa6f02 (diff)
Use std::string rather than malloc/free for saneDirName.
Also use std::vector instead of the cutils/array cruft. Change-Id: I273147335cafbac5d336955f53b0b29d015f0589
Diffstat (limited to 'dexopt')
-rw-r--r--dexopt/Android.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/dexopt/Android.mk b/dexopt/Android.mk
index 241893a48..04f2f971c 100644
--- a/dexopt/Android.mk
+++ b/dexopt/Android.mk
@@ -40,11 +40,18 @@ ifeq ($(TARGET_CPU_SMP),true)
else
LOCAL_CFLAGS += -DANDROID_SMP=0
endif
+
LOCAL_SRC_FILES := $(local_src_files)
LOCAL_C_INCLUDES := $(local_c_includes)
LOCAL_SHARED_LIBRARIES := $(local_shared_libraries) libcutils libexpat liblog libnativehelper libutils libz
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := dexopt
+
+ifneq ($(TARGET_SIMULATOR),true)
+ LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include
+ LOCAL_SHARED_LIBRARIES += libstlport
+endif
+
include $(BUILD_EXECUTABLE)
ifeq ($(WITH_HOST_DALVIK),true)