commit 2df6840f68dd18d7dd8dbf53f8b6181bbfdc4fc4
author Brian Carlstrom <bdc@google.com> Wed Oct 15 04:36:12 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 15 04:36:12 2014 +0000
tree 8ace9b8a670150b9c2ed96628852baf6913a5cda
parent d2caad30be6598c78f900bb27738466875efaeec
parent 3d434d4d3b32ec4b4de35f885993a042b8fae5bb

Merge "Add tests for missing classes"

build/Android.executable.mk

diff --git a/build/Android.executable.mk b/build/Android.executable.mk
index c1cef99..02252ab 100644
--- a/build/Android.executable.mk
+++ b/build/Android.executable.mk
@@ -68,8 +68,6 @@
   # Mac OS linker doesn't understand --export-dynamic/--version-script.
   ifneq ($$(HOST_OS)-$$(art_target_or_host),darwin-host)
     LOCAL_LDFLAGS := -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--export-dynamic
-  else
-    LOCAL_LDFLAGS := -Wl,-export_dynamic
   endif
 
   ifeq ($$(art_target_or_host),target)

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index b38e64e..3e100e9 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -346,8 +346,6 @@
   ifneq ($$(HOST_OS)-$$(art_target_or_host),darwin-host)
     # Allow jni_compiler_test to find Java_MyClassNatives_bar within itself using dlopen(NULL, ...).
     LOCAL_LDFLAGS := -Wl,--export-dynamic -Wl,-u,Java_MyClassNatives_bar -Wl,-u,Java_MyClassNatives_sbar
-  else
-    LOCAL_LDFLAGS := -Wl,-export_dynamic
   endif
 
   LOCAL_CFLAGS := $$(ART_TEST_CFLAGS)

dalvikvm/Android.mk

diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk
index d5f3586..0bab429 100644
--- a/dalvikvm/Android.mk
+++ b/dalvikvm/Android.mk
@@ -59,8 +59,6 @@
 # Mac OS linker doesn't understand --export-dynamic.
 ifneq ($(HOST_OS),darwin)
   LOCAL_LDFLAGS += -Wl,--export-dynamic
-else
-  LOCAL_LDFLAGS += -Wl,-export_dynamic
 endif
 LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
 LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.common.mk