commit 7825334929b098b36e1144872200e75ba6d24b13
author Andreas Huber <andih@google.com> Thu Feb 06 15:25:25 2014 -0800
committer Andreas Huber <andih@google.com> Wed Feb 12 15:00:05 2014 -0800
tree 18f4d807ba8d59e0849ccd2032164d1613dddb9b
parent faa91f852e9526b2f112122da9ae0956526cf662

Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.

AndroidRuntimeBase (exported by libandroid_runtime_base.so) is all you need
to link against to gain the ability to do AndroidRuntimeBase::getJNIEnv()
thus minimizing build dependencies.

Change-Id: Ia7f0c94c8c02b974c068e0db34774827f96aa95b

native/android/Android.mk

diff --git a/native/android/Android.mk b/native/android/Android.mk
index cda38e0..f55f94a 100644
--- a/native/android/Android.mk
+++ b/native/android/Android.mk
@@ -25,7 +25,8 @@
     libbinder \
     libui \
     libgui \
-    libandroid_runtime
+    libandroid_runtime \
+    libandroid_runtime_derived
 
 LOCAL_STATIC_LIBRARIES := \
     libstorage

native/graphics/jni/Android.mk

diff --git a/native/graphics/jni/Android.mk b/native/graphics/jni/Android.mk
index 8b333e7..02fa1b9 100644
--- a/native/graphics/jni/Android.mk
+++ b/native/graphics/jni/Android.mk
@@ -20,6 +20,7 @@
 
 LOCAL_SHARED_LIBRARIES := \
     libandroid_runtime \
+    libandroid_runtime_derived \
     libskia
 
 LOCAL_C_INCLUDES += \