summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2015-12-13 15:50:27 -0800
committerYing Wang <wangying@google.com>2015-12-13 15:50:27 -0800
commiteb6561d6025da9f4c85cd5bd6dc4c7096831650c (patch)
tree1ae6e90e0ff23387f3a3328f0e72369412c2cb36 /Android.mk
parente368a1fd041a77437183054ff729e9cc79eb76f3 (diff)
downloadexternal_libcxx-eb6561d6025da9f4c85cd5bd6dc4c7096831650c.tar.gz
external_libcxx-eb6561d6025da9f4c85cd5bd6dc4c7096831650c.tar.bz2
external_libcxx-eb6561d6025da9f4c85cd5bd6dc4c7096831650c.zip
Remove conditional of TARGET_BUILD_APPS.
Now prebuilt libc++ in prebuilts/sdk/tools isn't exposed as a prebult module by default, so the conditional isn't necessary. This fixed apps build target in internal master. Bug: 26166064 Change-Id: Id4043b0e425b42744bae65facb879e54ebf08c05
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk5
1 files changed, 0 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index c2afe4e89..f04ce0e27 100644
--- a/Android.mk
+++ b/Android.mk
@@ -94,9 +94,6 @@ LOCAL_MULTILIB := both
LOCAL_CXX_STL := none
include $(BUILD_HOST_STATIC_LIBRARY)
-# Don't build for unbundled branches
-ifeq (,$(TARGET_BUILD_APPS))
-
# host dynamic lib
include $(CLEAR_VARS)
LOCAL_MODULE := libc++
@@ -121,5 +118,3 @@ include $(BUILD_HOST_SHARED_LIBRARY)
ifdef LIBCXX_TESTING
include $(LOCAL_PATH)/buildcmds/Android.mk
endif
-
-endif # TARGET_BUILD_APPS