commit 9ae000ca8c05ad6f700ad7bf119bbc92fb964b57
author Andreas Huber <andih@google.com> Thu Feb 13 17:22:33 2014 +0000
committer Andreas Huber <andih@google.com> Thu Feb 13 17:22:33 2014 +0000
tree 39535e468bacaef05410d512d0794c41d27f8181
parent 7825334929b098b36e1144872200e75ba6d24b13

Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."

This reverts commit 7825334929b098b36e1144872200e75ba6d24b13.

Change-Id: I1702eb3ff9d7192d64039c8bf4bc3fc5d8e458c4

native/android/Android.mk

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 @@
     libbinder \
     libui \
     libgui \
-    libandroid_runtime \
-    libandroid_runtime_derived
+    libandroid_runtime
 
 LOCAL_STATIC_LIBRARIES := \
     libstorage