| commit | 2579dbcfcf4d1efb0231e9b545de19fc6350f406 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed May 15 10:44:02 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 15 10:44:02 2013 -0700 |
| tree | b32b5983d58a170fcd74e2c808c565e7bed731de | |
| parent | e45710f19f3843dd0ec02d1a5c7f679f34a33846 [diff] | |
| parent | 3ce15fcc916e097b6a98efc57302e012dab69d6f [diff] |
am 3ce15fcc: am de1dadb7: Merge "Disable darwin build" * commit '3ce15fcc916e097b6a98efc57302e012dab69d6f': Disable darwin build
diff --git a/libcorkscrew/Android.mk b/libcorkscrew/Android.mk index 49c3b92..d62c2d5 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)