commit cfede668645d1fd40ff500974188cab5fb49d11c
author Brian Carlstrom <bdc@google.com> Sun Jan 29 17:25:54 2012 -0800
committer Brian Carlstrom <bdc@google.com> Sun Jan 29 17:27:36 2012 -0800
tree 3f8fbb40817a05c9520f0a27ec8f1d8b91f97e68
parent 3bb17a644e2945c3913cfbde245d2f520d62a3ff

Fix Mac build

Change-Id: I81ee45431604de5c788dd572faf2e582b477a498

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 1f57369..f665e0f 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -45,8 +45,11 @@
   LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
   LOCAL_SHARED_LIBRARIES := libartd
 
-  # options to allow jni_compiler_test to find Java_MyClass_bar within itself using dlopen(NULL, )
-  LOCAL_LDFLAGS := -Wl,--export-dynamic -Wl,-u,Java_MyClass_bar
+  # Mac OS linker doesn't understand --export-dynamic
+  ifeq ($(HOST_OS),linux)
+    # options to allow jni_compiler_test to find Java_MyClass_bar within itself using dlopen(NULL, )
+    LOCAL_LDFLAGS := -Wl,--export-dynamic -Wl,-u,Java_MyClass_bar
+  endif
 
   ifeq ($$(art_target_or_host),target)
     LOCAL_CFLAGS := $(ART_TARGET_CFLAGS) $(ART_TARGET_DEBUG_CFLAGS)