commit 4269fc8068d10fc95780e8a7e1e4d4eb43483883
author Glenn Kasten <gkasten@android.com> Wed Mar 19 09:05:59 2014 -0700
committer Glenn Kasten <gkasten@android.com> Wed Mar 19 10:55:00 2014 -0700
tree 756052e8b34fe18b5b90f7cb53f03409de37ccb6
parent ddf887c08b58382920effb7f0b2049e471960b4a

Use libaudioresampler instead of libaudioflinger

in order to be able to build libvideoeditor as 64-bit also.

libaudioresampler is available in both 32-bit and 64-bit,
unlike libaudioflinger which is currently 32-bit only.

Change-Id: Id63857da877b1e45b7c1f8e35f18dca6600be3f7

libvideoeditor/vss/src/Android.mk

diff --git a/libvideoeditor/vss/src/Android.mk b/libvideoeditor/vss/src/Android.mk
index 8856c41..47627ec 100755
--- a/libvideoeditor/vss/src/Android.mk
+++ b/libvideoeditor/vss/src/Android.mk
@@ -53,7 +53,7 @@
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SHARED_LIBRARIES :=       \
-    libaudioflinger             \
+    libaudioresampler           \
     libaudioutils               \
     libbinder                   \
     libcutils                   \
@@ -81,7 +81,6 @@
     $(TOP)/frameworks/av/libvideoeditor/vss/stagefrightshells/inc \
     $(TOP)/frameworks/av/services/audioflinger \
     $(TOP)/frameworks/native/include/media/openmax \
-    $(TOP)/frameworks/native/services/audioflinger \
     $(TOP)/system/media/audio_effects/include \
     $(TOP)/system/media/audio_utils/include
 
@@ -96,6 +95,4 @@
     -DM4xVSS_RESERVED_MOOV_DISK_SPACEno \
     -DDECODE_GIF_ON_SAVING
 
-LOCAL_32_BIT_ONLY := true
-
 include $(BUILD_SHARED_LIBRARY)