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
This commit is contained in:
@@ -94,9 +94,6 @@ LOCAL_MULTILIB := both
|
|||||||
LOCAL_CXX_STL := none
|
LOCAL_CXX_STL := none
|
||||||
include $(BUILD_HOST_STATIC_LIBRARY)
|
include $(BUILD_HOST_STATIC_LIBRARY)
|
||||||
|
|
||||||
# Don't build for unbundled branches
|
|
||||||
ifeq (,$(TARGET_BUILD_APPS))
|
|
||||||
|
|
||||||
# host dynamic lib
|
# host dynamic lib
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
LOCAL_MODULE := libc++
|
LOCAL_MODULE := libc++
|
||||||
@@ -121,5 +118,3 @@ include $(BUILD_HOST_SHARED_LIBRARY)
|
|||||||
ifdef LIBCXX_TESTING
|
ifdef LIBCXX_TESTING
|
||||||
include $(LOCAL_PATH)/buildcmds/Android.mk
|
include $(LOCAL_PATH)/buildcmds/Android.mk
|
||||||
endif
|
endif
|
||||||
|
|
||||||
endif # TARGET_BUILD_APPS
|
|
||||||
|
|||||||
Reference in New Issue
Block a user