Merge change I5038c78f
* changes:
Add missing shared libraries in linker commands. Currently these libraries are linked implicitly via dependencies of other shared libraries.
diff --git a/cmds/stagefright/Android.mk b/cmds/stagefright/Android.mk
index 100af89..68d8bb0 100644
--- a/cmds/stagefright/Android.mk
+++ b/cmds/stagefright/Android.mk
@@ -8,7 +8,7 @@
stagefright.cpp
LOCAL_SHARED_LIBRARIES := \
- libstagefright
+ libstagefright libmedia libutils libbinder
LOCAL_C_INCLUDES:= \
$(JNI_H_INCLUDE) \
@@ -30,7 +30,7 @@
record.cpp
LOCAL_SHARED_LIBRARIES := \
- libstagefright
+ libstagefright liblog libutils libbinder
LOCAL_C_INCLUDES:= \
$(JNI_H_INCLUDE) \
@@ -52,7 +52,7 @@
audioloop.cpp
LOCAL_SHARED_LIBRARIES := \
- libstagefright
+ libstagefright liblog libutils libbinder
LOCAL_C_INCLUDES:= \
$(JNI_H_INCLUDE) \
diff --git a/media/libstagefright/omx/tests/Android.mk b/media/libstagefright/omx/tests/Android.mk
index cd654510..ee117e5 100644
--- a/media/libstagefright/omx/tests/Android.mk
+++ b/media/libstagefright/omx/tests/Android.mk
@@ -7,7 +7,7 @@
OMXHarness.cpp \
LOCAL_SHARED_LIBRARIES := \
- libstagefright
+ libstagefright libbinder libmedia libutils
LOCAL_C_INCLUDES:= \
$(JNI_H_INCLUDE) \
diff --git a/media/tests/omxjpegdecoder/Android.mk b/media/tests/omxjpegdecoder/Android.mk
index e989078..f679f19 100644
--- a/media/tests/omxjpegdecoder/Android.mk
+++ b/media/tests/omxjpegdecoder/Android.mk
@@ -31,7 +31,9 @@
LOCAL_SHARED_LIBRARIES := \
libcutils \
libskia \
- libstagefright
+ libstagefright \
+ libbinder \
+ libutils
LOCAL_C_INCLUDES := \
$(JNI_H_INCLUDE) \