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 /media | |
| 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 'media')
| -rw-r--r-- | media/jni/Android.mk | 1 | ||||
| -rw-r--r-- | media/jni/mediaeditor/Android.mk | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/media/jni/Android.mk b/media/jni/Android.mk index 8323ae3..51fccd4 100644 --- a/media/jni/Android.mk +++ b/media/jni/Android.mk @@ -24,7 +24,6 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libandroid_runtime \ - libandroid_runtime_derived \ libnativehelper \ libutils \ libbinder \ diff --git a/media/jni/mediaeditor/Android.mk b/media/jni/mediaeditor/Android.mk index b9c70f8..6be7fdd 100644 --- a/media/jni/mediaeditor/Android.mk +++ b/media/jni/mediaeditor/Android.mk @@ -48,7 +48,6 @@ LOCAL_C_INCLUDES += \ LOCAL_SHARED_LIBRARIES := \ libandroid_runtime \ - libandroid_runtime_derived \ libaudioflinger \ libaudioutils \ libbinder \ |