diff options
| author | Dan Albert <danalbert@google.com> | 2014-05-19 19:21:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-19 19:21:37 +0000 |
| commit | e1efe23ff718d25c5f3d5ef7914f05f8f739eee5 (patch) | |
| tree | d3d865c806e0cedcee7d912dfec2e2f521c22307 | |
| parent | f03bd9537b77f996cddd562d88558151d3d6c7fd (diff) | |
| parent | a8b846022063a98ca623f5c67916dc6cb3fd2ad6 (diff) | |
| download | system_core-e1efe23ff718d25c5f3d5ef7914f05f8f739eee5.zip system_core-e1efe23ff718d25c5f3d5ef7914f05f8f739eee5.tar.gz system_core-e1efe23ff718d25c5f3d5ef7914f05f8f739eee5.tar.bz2 | |
Merge "Fix unbundled branches"
| -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. |