Clean up stlport usage.
Change-Id: I133cd88f1da37f6f801a9e07a78ae23b671cf4f1
diff --git a/build/Android.executable.mk b/build/Android.executable.mk
index 54f9926..fe540c0 100644
--- a/build/Android.executable.mk
+++ b/build/Android.executable.mk
@@ -58,7 +58,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $$(art_source)
LOCAL_C_INCLUDES += $(ART_C_INCLUDES) art/runtime $$(art_c_includes)
- LOCAL_SHARED_LIBRARIES := $$(art_shared_libraries) # libnativehelper
+ LOCAL_SHARED_LIBRARIES += $$(art_shared_libraries) # libnativehelper
ifeq ($$(art_ndebug_or_debug),ndebug)
LOCAL_MODULE := $$(art_executable)
@@ -91,10 +91,6 @@
LOCAL_SHARED_LIBRARIES += libartd
endif
- ifeq ($$(art_target_or_host),target)
- LOCAL_SHARED_LIBRARIES += libstlport
- endif
-
LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common.mk
LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.executable.mk
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 6a73fc0..ee1115a 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -106,9 +106,9 @@
endif
LOCAL_SRC_FILES := $$(art_gtest_filename) runtime/common_test.cc
LOCAL_C_INCLUDES += $(ART_C_INCLUDES) art/runtime art/compiler
- LOCAL_SHARED_LIBRARIES := libartd-compiler libartd
+ LOCAL_SHARED_LIBRARIES += libartd-compiler libartd
# dex2oatd is needed to go libartd-compiler and libartd
- LOCAL_REQUIRED_MODULES := dex2oatd
+ LOCAL_REQUIRED_MODULES := dex2oatd
LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common.mk
LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.gtest.mk
@@ -123,7 +123,7 @@
ifeq ($$(art_target_or_host),target)
LOCAL_CLANG := $(ART_TARGET_CLANG)
LOCAL_CFLAGS += $(ART_TARGET_CFLAGS) $(ART_TARGET_DEBUG_CFLAGS)
- LOCAL_SHARED_LIBRARIES += libdl libicuuc libicui18n libnativehelper libstlport libz libcutils
+ LOCAL_SHARED_LIBRARIES += libdl libicuuc libicui18n libnativehelper libz libcutils
LOCAL_STATIC_LIBRARIES += libgtest
LOCAL_MODULE_PATH := $(ART_NATIVETEST_OUT)
include $(LLVM_DEVICE_BUILD_MK)
diff --git a/build/Android.libarttest.mk b/build/Android.libarttest.mk
index 54a3859..4fb2bbf 100644
--- a/build/Android.libarttest.mk
+++ b/build/Android.libarttest.mk
@@ -39,14 +39,14 @@
LOCAL_MODULE_TAGS := tests
endif
LOCAL_SRC_FILES := $(LIBARTTEST_COMMON_SRC_FILES)
- LOCAL_SHARED_LIBRARIES := libartd
+ LOCAL_SHARED_LIBRARIES += libartd
LOCAL_C_INCLUDES += $(ART_C_INCLUDES) art/runtime
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/build/Android.common.mk
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/build/Android.libarttest.mk
ifeq ($$(art_target_or_host),target)
LOCAL_CLANG := $(ART_TARGET_CLANG)
LOCAL_CFLAGS := $(ART_TARGET_CFLAGS) $(ART_TARGET_DEBUG_CFLAGS)
- LOCAL_SHARED_LIBRARIES += libdl libstlport
+ LOCAL_SHARED_LIBRARIES += libdl
LOCAL_STATIC_LIBRARIES := libgtest
LOCAL_MODULE_PATH := $(ART_TEST_OUT)
include $(BUILD_SHARED_LIBRARY)
diff --git a/compiler/Android.mk b/compiler/Android.mk
index 68223a2..9f25022 100644
--- a/compiler/Android.mk
+++ b/compiler/Android.mk
@@ -158,7 +158,7 @@
# TODO: clean up the compilers and remove this.
LOCAL_CFLAGS += -Wno-unused-parameter
- LOCAL_SHARED_LIBRARIES := liblog
+ LOCAL_SHARED_LIBRARIES += liblog
ifeq ($$(art_ndebug_or_debug),debug)
ifeq ($$(art_target_or_host),target)
LOCAL_CFLAGS += $(ART_TARGET_DEBUG_CFLAGS)
@@ -181,9 +181,7 @@
LOCAL_C_INCLUDES += $(ART_C_INCLUDES) art/runtime
- ifeq ($$(art_target_or_host),target)
- LOCAL_SHARED_LIBRARIES += libstlport
- else # host
+ ifeq ($$(art_target_or_host),host)
LOCAL_LDLIBS := -ldl -lpthread
endif
LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common.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
diff --git a/runtime/Android.mk b/runtime/Android.mk
index 4638e78..7734aa5 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -329,10 +329,10 @@
endif
endif
LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
- LOCAL_SHARED_LIBRARIES := liblog libnativehelper
+ LOCAL_SHARED_LIBRARIES += liblog libnativehelper
LOCAL_SHARED_LIBRARIES += libcorkscrew # native stack trace support
ifeq ($$(art_target_or_host),target)
- LOCAL_SHARED_LIBRARIES += libcutils libstlport libz libdl libselinux
+ LOCAL_SHARED_LIBRARIES += libcutils libz libdl libselinux
else # host
LOCAL_STATIC_LIBRARIES += libcutils
LOCAL_SHARED_LIBRARIES += libz-host