diff options
| author | Dan Albert <danalbert@google.com> | 2014-05-19 19:31:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-19 19:31:17 +0000 |
| commit | 917152b8cce7a7d7cfd8904b077fd5dca169bc15 (patch) | |
| tree | 2e6458249c06b102be58113cdba642c81a037795 /libbacktrace | |
| parent | 7ce29b5826fca294319fd93f1dcf96f3e0479047 (diff) | |
| parent | 3f01965b3d1335ffff57e15fd47e5d99400dad3f (diff) | |
| download | system_core-917152b8cce7a7d7cfd8904b077fd5dca169bc15.zip system_core-917152b8cce7a7d7cfd8904b077fd5dca169bc15.tar.gz system_core-917152b8cce7a7d7cfd8904b077fd5dca169bc15.tar.bz2 | |
am 3f01965b: am 121f209d: am e1efe23f: Merge "Fix unbundled branches"
* commit '3f01965b3d1335ffff57e15fd47e5d99400dad3f':
Fix unbundled branches
Diffstat (limited to 'libbacktrace')
| -rwxr-xr-x | libbacktrace/Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk index 13898ec..5a0bc7f 100755 --- a/libbacktrace/Android.mk +++ b/libbacktrace/Android.mk @@ -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. |