diff options
| author | Andreas Huber <andih@google.com> | 2014-02-13 17:22:33 +0000 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2014-02-13 17:22:33 +0000 |
| commit | 9ae000ca8c05ad6f700ad7bf119bbc92fb964b57 (patch) | |
| tree | 39535e468bacaef05410d512d0794c41d27f8181 /native | |
| parent | 7825334929b098b36e1144872200e75ba6d24b13 (diff) | |
| download | frameworks_base-9ae000ca8c05ad6f700ad7bf119bbc92fb964b57.zip frameworks_base-9ae000ca8c05ad6f700ad7bf119bbc92fb964b57.tar.gz frameworks_base-9ae000ca8c05ad6f700ad7bf119bbc92fb964b57.tar.bz2 | |
Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."
This reverts commit 7825334929b098b36e1144872200e75ba6d24b13.
Change-Id: I1702eb3ff9d7192d64039c8bf4bc3fc5d8e458c4
Diffstat (limited to 'native')
| -rw-r--r-- | native/android/Android.mk | 3 | ||||
| -rw-r--r-- | native/graphics/jni/Android.mk | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/native/android/Android.mk b/native/android/Android.mk index f55f94a..cda38e0 100644 --- a/native/android/Android.mk +++ b/native/android/Android.mk @@ -25,8 +25,7 @@ LOCAL_SHARED_LIBRARIES := \ libbinder \ libui \ libgui \ - libandroid_runtime \ - libandroid_runtime_derived + libandroid_runtime LOCAL_STATIC_LIBRARIES := \ libstorage diff --git a/native/graphics/jni/Android.mk b/native/graphics/jni/Android.mk index 02fa1b9..8b333e7 100644 --- a/native/graphics/jni/Android.mk +++ b/native/graphics/jni/Android.mk @@ -20,7 +20,6 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libandroid_runtime \ - libandroid_runtime_derived \ libskia LOCAL_C_INCLUDES += \ |