From b1bb6cfe91c97fccd720de565fa69ed787ae1cbc Mon Sep 17 00:00:00 2001
From: Doug Kwan <dougkwan@google.com>
Date: Sun, 4 Oct 2009 19:27:57 -0700
Subject: [PATCH] Add back missing shared libraries used in executables in link
 commands.  These executables have calls to some shared libraries without
 explicitly linking them.  Currently it works as linker links these libraries
 via dependencies of other libraries.  This is fragile and not the right thing
 to do.

---
 cmds/app_process/Android.mk          | 1 +
 cmds/bootanimation/Android.mk        | 1 +
 media/sdutils/Android.mk             | 2 +-
 opengl/tests/copybits/Android.mk     | 1 +
 opengl/tests/fillrate/Android.mk     | 1 +
 opengl/tests/finish/Android.mk       | 1 +
 opengl/tests/swapinterval/Android.mk | 1 +
 7 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk
index a33f5cc7c3e88..2391b72cc4a5a 100644
--- a/cmds/app_process/Android.mk
+++ b/cmds/app_process/Android.mk
@@ -7,6 +7,7 @@ LOCAL_SRC_FILES:= \
 LOCAL_SHARED_LIBRARIES := \
 	libcutils \
 	libutils \
+	libbinder \
 	libandroid_runtime
 
 LOCAL_MODULE:= app_process
diff --git a/cmds/bootanimation/Android.mk b/cmds/bootanimation/Android.mk
index 3449de1fe7379..939b63fa868f1 100644
--- a/cmds/bootanimation/Android.mk
+++ b/cmds/bootanimation/Android.mk
@@ -17,6 +17,7 @@ LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
 LOCAL_SHARED_LIBRARIES := \
 	libcutils \
 	libutils \
+	libbinder \
     libui \
 	libskia \
     libEGL \
diff --git a/media/sdutils/Android.mk b/media/sdutils/Android.mk
index dafb8a6af82a9..74e1eca00aac2 100644
--- a/media/sdutils/Android.mk
+++ b/media/sdutils/Android.mk
@@ -6,7 +6,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES:= \
 	sdutil.cpp \
 
-LOCAL_SHARED_LIBRARIES := libhardware_legacy libcutils libutils libc
+LOCAL_SHARED_LIBRARIES := libhardware_legacy libbinder libcutils libutils libc
 
 LOCAL_MODULE:= sdutil
 LOCAL_MODULE_TAGS := debug
diff --git a/opengl/tests/copybits/Android.mk b/opengl/tests/copybits/Android.mk
index d5ded42b5fb18..566b9d7881ff2 100644
--- a/opengl/tests/copybits/Android.mk
+++ b/opengl/tests/copybits/Android.mk
@@ -6,6 +6,7 @@ LOCAL_SRC_FILES:= \
 
 LOCAL_SHARED_LIBRARIES := \
 	libcutils \
+	libhardware \
     libEGL \
     libGLESv1_CM \
     libui
diff --git a/opengl/tests/fillrate/Android.mk b/opengl/tests/fillrate/Android.mk
index a7d30c25f0f07..191c59b5abb3e 100644
--- a/opengl/tests/fillrate/Android.mk
+++ b/opengl/tests/fillrate/Android.mk
@@ -6,6 +6,7 @@ LOCAL_SRC_FILES:= \
 
 LOCAL_SHARED_LIBRARIES := \
 	libcutils \
+	libutils \
     libEGL \
     libGLESv1_CM \
     libui
diff --git a/opengl/tests/finish/Android.mk b/opengl/tests/finish/Android.mk
index 56208147da01b..aa607c6a27889 100644
--- a/opengl/tests/finish/Android.mk
+++ b/opengl/tests/finish/Android.mk
@@ -6,6 +6,7 @@ LOCAL_SRC_FILES:= \
 
 LOCAL_SHARED_LIBRARIES := \
 	libcutils \
+	libutils \
     libEGL \
     libGLESv1_CM \
     libui
diff --git a/opengl/tests/swapinterval/Android.mk b/opengl/tests/swapinterval/Android.mk
index 619447ca6422a..9a4145eb4874d 100644
--- a/opengl/tests/swapinterval/Android.mk
+++ b/opengl/tests/swapinterval/Android.mk
@@ -6,6 +6,7 @@ LOCAL_SRC_FILES:= \
 
 LOCAL_SHARED_LIBRARIES := \
 	libcutils \
+	libutils \
     libEGL \
     libGLESv1_CM \
     libui