commit e3772efdc5dacf9a580786b836daa77ce127cb6e
author Android (Google) Code Review <android-gerrit@google.com> Wed Jul 29 14:10:12 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 29 14:10:12 2009 -0700
tree aa6176b9e03a15afe48de8730686dc2a5096e0cf
parent 918dca8985a190d15146bfc7e1ed1a2020fc23c7
parent c1d7a6ec1e8058135f1058d93811dff55e331276

Merge change 9008

* changes:
  Only restore the bits for wallpapers that aren't built in.

libs/audioflinger/Android.mk

diff --git a/libs/audioflinger/Android.mk b/libs/audioflinger/Android.mk
index c10e02b..f5c03bb 100644
--- a/libs/audioflinger/Android.mk
+++ b/libs/audioflinger/Android.mk
@@ -107,6 +107,7 @@
 
 ifeq ($(BOARD_HAVE_BLUETOOTH),true)
   LOCAL_CFLAGS += -DWITH_BLUETOOTH -DWITH_A2DP
+  LOCAL_SHARED_LIBRARIES += liba2dp
 endif
 
 ifeq ($(AUDIO_POLICY_TEST),true)

opengl/libs/EGL/Loader.cpp

diff --git a/opengl/libs/EGL/Loader.cpp b/opengl/libs/EGL/Loader.cpp
index 7f3f114..445e681 100644
--- a/opengl/libs/EGL/Loader.cpp
+++ b/opengl/libs/EGL/Loader.cpp
@@ -149,7 +149,7 @@
             hnd = new driver_t(dso);
         } else {
             // Always load EGL first
-            snprintf(path, PATH_MAX, "lib%s_%s.so", "EGL", tag);
+            snprintf(path, PATH_MAX, format, "EGL", tag);
             dso = load_driver(path, hooks, EGL);
             if (dso) {
                 hnd = new driver_t(dso);