commit 4e158f525e83831046392101b49c6aa1a3ec5c76
author Andreas Huber <andih@google.com> Thu Feb 13 17:22:11 2014 +0000
committer Andreas Huber <andih@google.com> Thu Feb 13 17:22:11 2014 +0000
tree b78c32c690262fc9df42237b4fe19a4b0f4db9b5
parent fabfb9c45022892cc40c99831e1d85f19abd4016

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

This reverts commit fabfb9c45022892cc40c99831e1d85f19abd4016.

Change-Id: I6339059d3a8320783294c745cc428188ed04ed9b

camera/Android.mk

diff --git a/camera/Android.mk b/camera/Android.mk
index 7a5bd3d..d852e7f 100644
--- a/camera/Android.mk
+++ b/camera/Android.mk
@@ -82,8 +82,7 @@
     libcutils \
     liblog \
     libskia \
-    libandroid_runtime \
-    libandroid_runtime_derived
+    libandroid_runtime
 
 LOCAL_C_INCLUDES += external/jpeg \
                     external/skia/include/core/ \