| commit | 3ce15fcc916e097b6a98efc57302e012dab69d6f | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed May 15 10:41:45 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 15 10:41:45 2013 -0700 |
| tree | bd8240eeae77cc594dd519e9edde92e3ef855eaa | |
| parent | 5a98566d589408c78e35f4476f478a2fa1c13e78 [diff] | |
| parent | de1dadb73903a3b8d080ed6d2b5e916fe9654fc4 [diff] |
am de1dadb7: Merge "Disable darwin build" * commit 'de1dadb73903a3b8d080ed6d2b5e916fe9654fc4': 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)