diff options
Diffstat (limited to 'build/Android.executable.mk')
| -rw-r--r-- | build/Android.executable.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/build/Android.executable.mk b/build/Android.executable.mk index 27d687c529..6aa1c1836e 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 |