diff options
| -rw-r--r-- | build/Android.executable.mk | 1 | ||||
| -rw-r--r-- | build/Android.gtest.mk | 3 | ||||
| -rw-r--r-- | compiler/Android.mk | 1 | ||||
| -rw-r--r-- | dalvikvm/Android.mk | 2 | ||||
| -rw-r--r-- | disassembler/Android.mk | 1 | ||||
| -rw-r--r-- | runtime/Android.mk | 1 | ||||
| -rw-r--r-- | sigchainlib/Android.mk | 1 | ||||
| -rw-r--r-- | test/Android.libarttest.mk | 1 | ||||
| -rw-r--r-- | test/Android.libnativebridgetest.mk | 1 |
9 files changed, 0 insertions, 12 deletions
diff --git a/build/Android.executable.mk b/build/Android.executable.mk index ef9e7cd..4bb2cb1 100644 --- a/build/Android.executable.mk +++ b/build/Android.executable.mk @@ -129,7 +129,6 @@ define build-art-executable endif endif - include external/libcxx/libcxx.mk ifeq ($$(art_target_or_host),target) include $(BUILD_EXECUTABLE) ART_TARGET_EXECUTABLES := $(ART_TARGET_EXECUTABLES) $$(foreach name,$$(art_out_binary_name),$(TARGET_OUT_EXECUTABLES)/$$(name)) diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index efb45c7..a5cfcba 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -219,7 +219,6 @@ LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.gtest.mk $(eval $(call set-target-local-clang-vars)) $(eval $(call set-target-local-cflags-vars,debug)) -include external/libcxx/libcxx.mk include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -236,7 +235,6 @@ LOCAL_MULTILIB := both LOCAL_CLANG := $(ART_HOST_CLANG) LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.gtest.mk -include external/libcxx/libcxx.mk include $(BUILD_HOST_SHARED_LIBRARY) # Variables holding collections of gtest pre-requisits used to run a number of gtests. @@ -368,7 +366,6 @@ define define-art-gtest endif LOCAL_CFLAGS := $$(ART_TEST_CFLAGS) - include external/libcxx/libcxx.mk ifeq ($$(art_target_or_host),target) $$(eval $$(call set-target-local-clang-vars)) $$(eval $$(call set-target-local-cflags-vars,debug)) diff --git a/compiler/Android.mk b/compiler/Android.mk index 1d4f5a3..a3de913 100644 --- a/compiler/Android.mk +++ b/compiler/Android.mk @@ -209,7 +209,6 @@ $$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : $(LOCAL_PAT LOCAL_GENERATED_SOURCES += $$(ENUM_OPERATOR_OUT_GEN) LOCAL_CFLAGS := $$(LIBART_COMPILER_CFLAGS) - include external/libcxx/libcxx.mk ifeq ($$(art_target_or_host),target) $(call set-target-local-clang-vars) $(call set-target-local-cflags-vars,$(2)) diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk index 0ef20d6..239e746 100644 --- a/dalvikvm/Android.mk +++ b/dalvikvm/Android.mk @@ -35,7 +35,6 @@ LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.common.mk LOCAL_MULTILIB := both LOCAL_MODULE_STEM_32 := dalvikvm32 LOCAL_MODULE_STEM_64 := dalvikvm64 -include external/libcxx/libcxx.mk include $(BUILD_EXECUTABLE) # Create symlink for the primary version target. @@ -68,7 +67,6 @@ LOCAL_IS_HOST_MODULE := true LOCAL_MULTILIB := both LOCAL_MODULE_STEM_32 := dalvikvm32 LOCAL_MODULE_STEM_64 := dalvikvm64 -include external/libcxx/libcxx.mk include $(BUILD_HOST_EXECUTABLE) # Create symlink for the primary version target. diff --git a/disassembler/Android.mk b/disassembler/Android.mk index 218b23b..735c850 100644 --- a/disassembler/Android.mk +++ b/disassembler/Android.mk @@ -84,7 +84,6 @@ define build-libart-disassembler LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk - include external/libcxx/libcxx.mk # For disassembler_arm64. ifeq ($$(art_ndebug_or_debug),debug) LOCAL_SHARED_LIBRARIES += libvixld diff --git a/runtime/Android.mk b/runtime/Android.mk index 8a4b8c0..a53616a 100644 --- a/runtime/Android.mk +++ b/runtime/Android.mk @@ -460,7 +460,6 @@ $$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : $(LOCAL_PAT LOCAL_C_INCLUDES += art/sigchainlib LOCAL_SHARED_LIBRARIES := libnativehelper libnativebridge libsigchain - include external/libcxx/libcxx.mk LOCAL_SHARED_LIBRARIES += libbacktrace ifeq ($$(art_target_or_host),target) LOCAL_SHARED_LIBRARIES += libdl diff --git a/sigchainlib/Android.mk b/sigchainlib/Android.mk index 35dec4b..e0f1769 100644 --- a/sigchainlib/Android.mk +++ b/sigchainlib/Android.mk @@ -69,5 +69,4 @@ LOCAL_MODULE:= libsigchain LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk LOCAL_LDLIBS = -ldl LOCAL_MULTILIB := both -include external/libcxx/libcxx.mk include $(BUILD_HOST_STATIC_LIBRARY) diff --git a/test/Android.libarttest.mk b/test/Android.libarttest.mk index c9c0475..e64df5c 100644 --- a/test/Android.libarttest.mk +++ b/test/Android.libarttest.mk @@ -55,7 +55,6 @@ define build-libarttest LOCAL_C_INCLUDES += $(ART_C_INCLUDES) art/runtime LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.libarttest.mk - include external/libcxx/libcxx.mk ifeq ($$(art_target_or_host),target) $(call set-target-local-clang-vars) $(call set-target-local-cflags-vars,debug) diff --git a/test/Android.libnativebridgetest.mk b/test/Android.libnativebridgetest.mk index 1b20e69..452278a 100644 --- a/test/Android.libnativebridgetest.mk +++ b/test/Android.libnativebridgetest.mk @@ -47,7 +47,6 @@ define build-libnativebridgetest LOCAL_C_INCLUDES += $(ART_C_INCLUDES) art/runtime LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.libnativebridgetest.mk - include external/libcxx/libcxx.mk ifeq ($$(art_target_or_host),target) $(call set-target-local-clang-vars) $(call set-target-local-cflags-vars,debug) |