summaryrefslogtreecommitdiffstats
path: root/native
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2014-02-06 15:25:25 -0800
committerAndreas Huber <andih@google.com>2014-02-12 15:00:05 -0800
commit7825334929b098b36e1144872200e75ba6d24b13 (patch)
tree18f4d807ba8d59e0849ccd2032164d1613dddb9b /native
parentfaa91f852e9526b2f112122da9ae0956526cf662 (diff)
downloadframeworks_base-7825334929b098b36e1144872200e75ba6d24b13.zip
frameworks_base-7825334929b098b36e1144872200e75ba6d24b13.tar.gz
frameworks_base-7825334929b098b36e1144872200e75ba6d24b13.tar.bz2
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
Diffstat (limited to 'native')
-rw-r--r--native/android/Android.mk3
-rw-r--r--native/graphics/jni/Android.mk1
2 files changed, 3 insertions, 1 deletions
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 @@ LOCAL_SHARED_LIBRARIES := \
libbinder \
libui \
libgui \
- libandroid_runtime
+ libandroid_runtime \
+ libandroid_runtime_derived
LOCAL_STATIC_LIBRARIES := \
libstorage
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_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \
libandroid_runtime \
+ libandroid_runtime_derived \
libskia
LOCAL_C_INCLUDES += \