summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/tests
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2012-03-28 10:29:14 -0700
committerAnatol Pomozov <anatol.pomozov@gmail.com>2012-03-28 12:07:41 -0700
commit559bf2836f5da25b75bfb229fec0d20d540ee426 (patch)
treed7dd708b17eeca96a3e5d8bcc25a51ff3d1b5d0d /media/libstagefright/tests
parentb0b2b4d890cf3bfb274797a759642b4e733343d7 (diff)
downloadframeworks_av-559bf2836f5da25b75bfb229fec0d20d540ee426.zip
frameworks_av-559bf2836f5da25b75bfb229fec0d20d540ee426.tar.gz
frameworks_av-559bf2836f5da25b75bfb229fec0d20d540ee426.tar.bz2
AV Android make files changes
o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc o remove some runtime dependencies to libandroid, libandroid_runtime, etc Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10
Diffstat (limited to 'media/libstagefright/tests')
-rw-r--r--media/libstagefright/tests/Android.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/media/libstagefright/tests/Android.mk b/media/libstagefright/tests/Android.mk
index 656a630..a1e6be7 100644
--- a/media/libstagefright/tests/Android.mk
+++ b/media/libstagefright/tests/Android.mk
@@ -15,7 +15,6 @@ LOCAL_SRC_FILES := \
LOCAL_SHARED_LIBRARIES := \
libEGL \
libGLESv2 \
- libandroid \
libbinder \
libcutils \
libgui \
@@ -36,8 +35,8 @@ LOCAL_C_INCLUDES := \
bionic/libstdc++/include \
external/gtest/include \
external/stlport/stlport \
- frameworks/base/media/libstagefright \
- frameworks/base/media/libstagefright/include \
+ frameworks/av/media/libstagefright \
+ frameworks/av/media/libstagefright/include \
$(TOP)/frameworks/native/include/media/openmax \
include $(BUILD_EXECUTABLE)