diff options
-rw-r--r-- | build/Android.executable.mk | 7 | ||||
-rw-r--r-- | build/Android.gtest.mk | 7 | ||||
-rw-r--r-- | build/Android.libarttest.mk | 7 | ||||
-rw-r--r-- | build/Android.libcxx.mk | 20 | ||||
-rw-r--r-- | compiler/Android.mk | 5 | ||||
-rw-r--r-- | dalvikvm/Android.mk | 4 | ||||
-rw-r--r-- | dalvikvm/dalvikvm.cc | 5 | ||||
-rw-r--r-- | disassembler/Android.mk | 7 | ||||
-rw-r--r-- | runtime/Android.mk | 5 |
9 files changed, 41 insertions, 26 deletions
diff --git a/build/Android.executable.mk b/build/Android.executable.mk index 27d687c..6aa1c18 100644 --- a/build/Android.executable.mk +++ b/build/Android.executable.mk @@ -52,10 +52,6 @@ define build-art-executable art_multilib := $(7) include $(CLEAR_VARS) - ifeq ($$(art_target_or_host),target) - include external/stlport/libstlport.mk - endif - LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION) LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $$(art_source) @@ -104,9 +100,12 @@ define build-art-executable endif ifeq ($$(art_target_or_host),target) + include art/build/Android.libcxx.mk include $(BUILD_EXECUTABLE) ART_TARGET_EXECUTABLES := $(ART_TARGET_EXECUTABLES) $(TARGET_OUT_EXECUTABLES)/$$(LOCAL_MODULE) else # host + LOCAL_IS_HOST_MODULE := true + include art/build/Android.libcxx.mk include $(BUILD_HOST_EXECUTABLE) ART_HOST_EXECUTABLES := $(ART_HOST_EXECUTABLES) $(HOST_OUT_EXECUTABLES)/$$(LOCAL_MODULE) endif diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 24acc56..b6e6fac 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -150,10 +150,6 @@ define build-art-test art_gtest_name := $$(notdir $$(basename $$(art_gtest_filename))) include $(CLEAR_VARS) - ifeq ($$(art_target_or_host),target) - include external/stlport/libstlport.mk - endif - LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION) LOCAL_MODULE := $$(art_gtest_name) ifeq ($$(art_target_or_host),target) @@ -184,6 +180,7 @@ define build-art-test LOCAL_MODULE_PATH_32 := $(ART_BASE_NATIVETEST_OUT) LOCAL_MODULE_PATH_64 := $(ART_BASE_NATIVETEST_OUT)64 LOCAL_MULTILIB := both + include art/build/Android.libcxx.mk include $(BUILD_EXECUTABLE) ART_TARGET_GTEST_EXECUTABLES += $$(art_gtest_exe) art_gtest_target := test-art-$$(art_target_or_host)-gtest-$$(art_gtest_name) @@ -208,6 +205,8 @@ $$(art_gtest_target): $$(art_gtest_target)$(ART_PHONY_TEST_TARGET_SUFFIX) LOCAL_STATIC_LIBRARIES += libgtest_host endif LOCAL_LDLIBS += -lpthread -ldl + LOCAL_IS_HOST_MODULE := true + include art/build/Android.libcxx.mk include $(BUILD_HOST_EXECUTABLE) art_gtest_exe := $(HOST_OUT_EXECUTABLES)/$$(LOCAL_MODULE) ART_HOST_GTEST_EXECUTABLES += $$(art_gtest_exe) diff --git a/build/Android.libarttest.mk b/build/Android.libarttest.mk index 14d16ac..18d321a 100644 --- a/build/Android.libarttest.mk +++ b/build/Android.libarttest.mk @@ -31,10 +31,6 @@ define build-libarttest art_target_or_host := $(1) include $(CLEAR_VARS) - ifeq ($$(art_target_or_host),target) - include external/stlport/libstlport.mk - endif - LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION) LOCAL_MODULE := libarttest ifeq ($$(art_target_or_host),target) @@ -55,6 +51,7 @@ define build-libarttest LOCAL_MODULE_PATH_32 := $(ART_BASE_TEST_OUT) LOCAL_MODULE_PATH_64 := $(ART_BASE_TEST_OUT)64 LOCAL_MODULE_TARGET_ARCH := $(ART_SUPPORTED_ARCH) + include art/build/Android.libcxx.mk include $(BUILD_SHARED_LIBRARY) else # host LOCAL_CLANG := $(ART_HOST_CLANG) @@ -64,6 +61,8 @@ define build-libarttest ifeq ($(HOST_OS),linux) LOCAL_LDLIBS += -lrt endif + LOCAL_IS_HOST_MODULE := true + include art/build/Android.libcxx.mk include $(BUILD_HOST_SHARED_LIBRARY) endif endef diff --git a/build/Android.libcxx.mk b/build/Android.libcxx.mk new file mode 100644 index 0000000..3dd1eb7 --- /dev/null +++ b/build/Android.libcxx.mk @@ -0,0 +1,20 @@ +# +# Copyright (C) 2014 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +ifneq ($(LOCAL_IS_HOST_MODULE),true) + include external/stlport/libstlport.mk + # include external/libcxx/libcxx.mk +endif diff --git a/compiler/Android.mk b/compiler/Android.mk index b17cd52..6d656e6 100644 --- a/compiler/Android.mk +++ b/compiler/Android.mk @@ -158,11 +158,10 @@ define build-libart-compiler art_ndebug_or_debug := $(2) include $(CLEAR_VARS) - ifeq ($$(art_target_or_host),target) - include external/stlport/libstlport.mk - else + ifeq ($$(art_target_or_host),host) LOCAL_IS_HOST_MODULE := true endif + include art/build/Android.libcxx.mk LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION) ifeq ($$(art_ndebug_or_debug),ndebug) LOCAL_MODULE := libart-compiler diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk index 231fba1..e99c76f 100644 --- a/dalvikvm/Android.mk +++ b/dalvikvm/Android.mk @@ -29,7 +29,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MULTILIB := both LOCAL_MODULE_STEM_32 := dalvikvm LOCAL_MODULE_STEM_64 := dalvikvm64 -include external/stlport/libstlport.mk +include art/build/Android.libcxx.mk include $(BUILD_EXECUTABLE) ART_TARGET_EXECUTABLES += $(TARGET_OUT_EXECUTABLES)/$(LOCAL_MODULE) @@ -43,6 +43,8 @@ LOCAL_CFLAGS := $(dalvikvm_cflags) LOCAL_SHARED_LIBRARIES := libnativehelper LOCAL_LDFLAGS := -ldl -lpthread LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +LOCAL_IS_HOST_MODULE := true +include art/build/Android.libcxx.mk include $(BUILD_HOST_EXECUTABLE) ART_HOST_EXECUTABLES += $(HOST_OUT_EXECUTABLES)/$(LOCAL_MODULE) endif diff --git a/dalvikvm/dalvikvm.cc b/dalvikvm/dalvikvm.cc index 3486c1d..8d71a7c 100644 --- a/dalvikvm/dalvikvm.cc +++ b/dalvikvm/dalvikvm.cc @@ -15,11 +15,10 @@ */ #include <signal.h> +#include <stdio.h> +#include <string.h> #include <algorithm> -#include <cstdio> -#include <cstring> -#include <string> #include "jni.h" #include "JniInvocation.h" diff --git a/disassembler/Android.mk b/disassembler/Android.mk index 56929fc..17828fd 100644 --- a/disassembler/Android.mk +++ b/disassembler/Android.mk @@ -43,11 +43,10 @@ define build-libart-disassembler art_ndebug_or_debug := $(2) include $(CLEAR_VARS) - ifeq ($$(art_target_or_host),target) - include external/stlport/libstlport.mk - else - LOCAL_IS_HOST_MODULE := true + ifeq ($$(art_target_or_host),host) + LOCAL_IS_HOST_MODULE := true endif + include art/build/Android.libcxx.mk LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION) ifeq ($$(art_ndebug_or_debug),ndebug) LOCAL_MODULE := libart-disassembler diff --git a/runtime/Android.mk b/runtime/Android.mk index 9df69f0..d433fd5 100644 --- a/runtime/Android.mk +++ b/runtime/Android.mk @@ -344,9 +344,6 @@ define build-libart art_clang := $(3) include $(CLEAR_VARS) - ifeq ($$(art_target_or_host),target) - include external/stlport/libstlport.mk - endif LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION) ifeq ($$(art_ndebug_or_debug),ndebug) LOCAL_MODULE := libart @@ -366,6 +363,8 @@ define build-libart LOCAL_IS_HOST_MODULE := true endif + include art/build/Android.libcxx.mk + GENERATED_SRC_DIR := $$(call local-generated-sources-dir) ENUM_OPERATOR_OUT_CC_FILES := $$(patsubst %.h,%_operator_out.cc,$$(LIBART_ENUM_OPERATOR_OUT_HEADER_FILES)) ENUM_OPERATOR_OUT_GEN := $$(addprefix $$(GENERATED_SRC_DIR)/,$$(ENUM_OPERATOR_OUT_CC_FILES)) |