| commit | a616e320339206339dbf51da50f0904010ff71ca | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Thu Aug 23 17:39:09 2012 -0700 |
| committer | android code review <noreply-gerritcodereview@google.com> | Thu Aug 23 17:39:10 2012 -0700 |
| tree | 18833f092a8433ae6afadbb024cb8c8d352ef7ab | |
| parent | 742a55155e566571d70bf22f04d933ba32c0c955 [diff] | |
| parent | 6eb25c716f097615f3c975c22b1b1bfaff914c34 [diff] |
Merge "Fix mac build"
diff --git a/Makefile.common b/Makefile.common index cbb22e5..882d638 100644 --- a/Makefile.common +++ b/Makefile.common
@@ -683,7 +683,7 @@ ## another for 64-bit, see note in emulator64-common -ifeq ($(HOST_OS),linux) +ifneq ($(filter linux darwin,$(HOST_OS)),) ifneq ($(BUILD_STANDALONE_EMULATOR),true) $(call start-emulator-library, emulator64-libjpeg) LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) -m64