Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 917152b8 authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

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

* commit '3f01965b':
  Fix unbundled branches
parents 7ce29b58 3f01965b

libbacktrace/Android.mk

+3 −0
Original line number Original line Diff line number Diff line
@@ -72,6 +72,8 @@ include $(LOCAL_PATH)/Android.build.mk 
build_type := host

build_type := host

include $(LOCAL_PATH)/Android.build.mk

include $(LOCAL_PATH)/Android.build.mk





# Don't build for unbundled branches

ifeq (,$(TARGET_BUILD_APPS))

#-------------------------------------------------------------------------

#-------------------------------------------------------------------------

# The libbacktrace library (libc++)

# The libbacktrace library (libc++)

#-------------------------------------------------------------------------

#-------------------------------------------------------------------------
@@ -112,6 +114,7 @@ build_target := SHARED_LIBRARY 
include $(LOCAL_PATH)/Android.build.mk

include $(LOCAL_PATH)/Android.build.mk

build_type := host

build_type := host

include $(LOCAL_PATH)/Android.build.mk

include $(LOCAL_PATH)/Android.build.mk

endif





#-------------------------------------------------------------------------

#-------------------------------------------------------------------------

# The libbacktrace_test library needed by backtrace_test.

# The libbacktrace_test library needed by backtrace_test.