am 3f01965b: am 121f209d: am e1efe23f: Merge "Fix unbundled branches"

* commit '3f01965b3d1335ffff57e15fd47e5d99400dad3f':
  Fix unbundled branches
This commit is contained in:
Dan Albert 2014-05-19 19:31:17 +00:00 committed by Android Git Automerger
commit 917152b8cc

View file

@ -72,6 +72,8 @@ include $(LOCAL_PATH)/Android.build.mk
build_type := host
include $(LOCAL_PATH)/Android.build.mk
# Don't build for unbundled branches
ifeq (,$(TARGET_BUILD_APPS))
#-------------------------------------------------------------------------
# The libbacktrace library (libc++)
#-------------------------------------------------------------------------
@ -112,6 +114,7 @@ build_target := SHARED_LIBRARY
include $(LOCAL_PATH)/Android.build.mk
build_type := host
include $(LOCAL_PATH)/Android.build.mk
endif
#-------------------------------------------------------------------------
# The libbacktrace_test library needed by backtrace_test.