| commit | de1dadb73903a3b8d080ed6d2b5e916fe9654fc4 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed May 15 16:33:45 2013 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed May 15 16:33:45 2013 +0000 |
| tree | 46732295f0e0e01e77e9b0d2aa4a14c1c991cd21 | |
| parent | 07db297045b33d5c0aaa37194da1616d764edd26 [diff] | |
| parent | b0df2f1525c655cea583423af28d8aead1c28a6d [diff] |
Merge "Disable darwin build"
diff --git a/libcorkscrew/Android.mk b/libcorkscrew/Android.mk index 20c48c3..25512e2 100644 --- a/libcorkscrew/Android.mk +++ b/libcorkscrew/Android.mk
@@ -67,7 +67,9 @@ include $(BUILD_EXECUTABLE) -ifeq ($(HOST_ARCH),x86) +# TODO: reenable darwin-x86 +# ifeq ($(HOST_ARCH),x86) +ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86) # Build libcorkscrew. include $(CLEAR_VARS)