commit 9495e0c56b25349220aed7adb997d81f9b0c86cc
author Mathieu Chartier <mathieuc@google.com> Tue Aug 30 00:14:53 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 30 00:14:53 2016 +0000
tree 9612589aaba553880c6e083710a3b5630b0a7b3b
parent 3079bc2b73666320a5d2d3454f5c418ef0d37519
parent 84d9425b34e7e4d03b4883ac8858b2cdf4951789

Merge "Re-enable evacuation of recently allocated regions"

runtime/Android.bp

diff --git a/runtime/Android.bp b/runtime/Android.bp
index 012256e..c92df4e 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -439,6 +439,11 @@
 art_cc_library {
     name: "libart",
     defaults: ["libart_defaults"],
+    // Leave the symbols in the shared library so that stack unwinders can
+    // produce meaningful name resolution.
+    strip: {
+        keep_symbols: true,
+    },
 }
 
 art_cc_library {
@@ -447,11 +452,6 @@
         "libart_defaults",
         "art_debug_defaults",
     ],
-    // Leave the symbols in the shared library so that stack unwinders can
-    // produce meaningful name resolution.
-    strip: {
-        keep_symbols: true,
-    },
 }
 
 subdirs = [

test/Android.libnativebridgetest.mk

diff --git a/test/Android.libnativebridgetest.mk b/test/Android.libnativebridgetest.mk
index 5c97e4d..aa83016 100644
--- a/test/Android.libnativebridgetest.mk
+++ b/test/Android.libnativebridgetest.mk
@@ -61,7 +61,7 @@
     LOCAL_CLANG := $(ART_HOST_CLANG)
     LOCAL_CFLAGS := $(ART_HOST_CFLAGS) $(ART_HOST_DEBUG_CFLAGS)
     LOCAL_ASFLAGS := $(ART_HOST_ASFLAGS) $(ART_HOST_DEBUG_ASFLAGS)
-    LOCAL_SHARED_LIBRARIES := libcutils
+    LOCAL_SHARED_LIBRARIES += libcutils
     LOCAL_LDLIBS := -ldl -lpthread
     ifeq ($(HOST_OS),linux)
       LOCAL_LDLIBS += -lrt