From 5ddb19e5305365d23ffd46751d8963d9b739b49d Mon Sep 17 00:00:00 2001
From: James Dong <jdong@google.com>
Date: Tue, 15 May 2012 00:25:22 -0700
Subject: [PATCH] Remove dependency of libvideoeditor_jni.so on static libs
 from video editor engine

related-to-bug: 6502980

Change-Id: I77aa67dac73ecb6200cfc885c426c23d70929e5d
---
 media/jni/mediaeditor/Android.mk | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/media/jni/mediaeditor/Android.mk b/media/jni/mediaeditor/Android.mk
index d1cf8b501ecea..040d2abe530e5 100755
--- a/media/jni/mediaeditor/Android.mk
+++ b/media/jni/mediaeditor/Android.mk
@@ -47,20 +47,23 @@ LOCAL_C_INCLUDES += \
     $(TOP)/frameworks/native/include/media/openmax
 
 LOCAL_SHARED_LIBRARIES := \
+    libandroid_runtime \
+    libaudioflinger \
     libaudioutils \
+    libbinder \
     libcutils \
     libdl \
-    libutils \
-    libandroid_runtime \
-    libnativehelper \
+    libgui \
     libmedia \
-    libaudioflinger \
-    libbinder \
+    libnativehelper \
     libstagefright \
     libstagefright_foundation \
     libstagefright_omx \
-    libgui \
-    libvideoeditorplayer
+    libutils \
+    libvideoeditor_core \
+    libvideoeditor_osal \
+    libvideoeditor_videofilters \
+    libvideoeditorplayer \
 
 
 LOCAL_CFLAGS += \
@@ -72,15 +75,6 @@ LOCAL_CFLAGS += \
     -DUSE_STAGEFRIGHT_READERS \
     -DUSE_STAGEFRIGHT_3GPP_READER
 
-LOCAL_STATIC_LIBRARIES := \
-    libvideoeditor_core \
-    libstagefright_color_conversion \
-    libvideoeditor_3gpwriter \
-    libvideoeditor_mcs \
-    libvideoeditor_videofilters \
-    libvideoeditor_stagefrightshells \
-    libvideoeditor_osal
-
 LOCAL_MODULE:= libvideoeditor_jni
 
 LOCAL_MODULE_TAGS := optional