Revert "Add libpower to all build targets that depend on libosi."

This reverts commit 5997f91a5224ac6072eff11c89b7b9658d3d7df0.

Change-Id: If682757bca55ecc0057bdd058b654ecbdcc7e50a

diff --git a/audio_a2dp_hw/Android.mk b/audio_a2dp_hw/Android.mk
index 8581941..e745d0c 100644 (file)
--- a/audio_a2dp_hw/Android.mk
+++ b/audio_a2dp_hw/Android.mk
@@ -15,7 +15,7 @@ LOCAL_CFLAGS += -std=c99 $(bdroid_CFLAGS)
 LOCAL_MODULE := audio.a2dp.default
 LOCAL_MODULE_RELATIVE_PATH := hw
 
-LOCAL_SHARED_LIBRARIES := liblog libpower
+LOCAL_SHARED_LIBRARIES := liblog
 LOCAL_STATIC_LIBRARIES := libosi
 
 LOCAL_MODULE_TAGS := optional

diff --git a/btcore/Android.mk b/btcore/Android.mk
index 038c6bc..aa07cbe 100644 (file)
--- a/btcore/Android.mk
+++ b/btcore/Android.mk
@@ -86,7 +86,7 @@ LOCAL_SRC_FILES := $(btcoreCommonTestSrc)
 LOCAL_CFLAGS := -Wall -Werror -Werror=unused-variable
 LOCAL_MODULE := net_test_btcore
 LOCAL_MODULE_TAGS := tests
-LOCAL_SHARED_LIBRARIES := liblog libpower
+LOCAL_SHARED_LIBRARIES := liblog
 LOCAL_STATIC_LIBRARIES := libbtcore libosi
 include $(BUILD_NATIVE_TEST)
 
@@ -100,7 +100,7 @@ LOCAL_SRC_FILES := $(btcoreCommonTestSrc)
 LOCAL_CFLAGS := -Wall -Werror -Werror=unused-variable
 LOCAL_MODULE := net_test_btcore
 LOCAL_MODULE_TAGS := tests
-LOCAL_SHARED_LIBRARIES := liblog libpower
+LOCAL_SHARED_LIBRARIES := liblog
 LOCAL_STATIC_LIBRARIES := libbtcore-host libosi-host
 include $(BUILD_HOST_NATIVE_TEST)
 endif

diff --git a/device/Android.mk b/device/Android.mk
index 88632be..56d303f 100644 (file)
--- a/device/Android.mk
+++ b/device/Android.mk
@@ -67,7 +67,7 @@ LOCAL_SRC_FILES := \
 LOCAL_CFLAGS := -Wall -Werror -Werror=unused-variable
 LOCAL_MODULE := net_test_device
 LOCAL_MODULE_TAGS := tests
-LOCAL_SHARED_LIBRARIES := liblog libdl libpower
+LOCAL_SHARED_LIBRARIES := liblog libdl
 LOCAL_STATIC_LIBRARIES := libbtdevice libbtcore libosi libcutils
 
 include $(BUILD_NATIVE_TEST)

diff --git a/main/Android.mk b/main/Android.mk
index ff7b4a5..7a7fb77 100644 (file)
--- a/main/Android.mk
+++ b/main/Android.mk
@@ -130,7 +130,6 @@ LOCAL_SHARED_LIBRARIES := \
     libcutils \
     libdl \
     liblog \
-    libpower \
     libz
 
 LOCAL_STATIC_LIBRARIES := \

diff --git a/osi/Android.mk b/osi/Android.mk
index e461e6d..a108559 100644 (file)
--- a/osi/Android.mk
+++ b/osi/Android.mk
@@ -83,7 +83,7 @@ LOCAL_CFLAGS := $(btosiCommonCFlags)
 LOCAL_CLANG_CFLAGS += -Wno-error=typedef-redefinition
 LOCAL_MODULE := libosi
 LOCAL_MODULE_TAGS := optional
-LOCAL_SHARED_LIBRARIES := libc liblog libpower
+LOCAL_SHARED_LIBRARIES := libc liblog
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 include $(BUILD_STATIC_LIBRARY)
 
@@ -103,7 +103,7 @@ LOCAL_CFLAGS := \
 LOCAL_CLANG_CFLAGS += -Wno-error=typedef-redefinition
 LOCAL_MODULE := libosi-host
 LOCAL_MODULE_TAGS := optional
-LOCAL_SHARED_LIBRARIES := liblog libpower
+LOCAL_SHARED_LIBRARIES := liblog
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 include $(BUILD_HOST_STATIC_LIBRARY)
 endif
@@ -133,7 +133,7 @@ LOCAL_CFLAGS := -Wall -UNDEBUG
 LOCAL_LDLIBS := -lrt -lpthread
 LOCAL_MODULE := net_test_osi
 LOCAL_MODULE_TAGS := tests
-LOCAL_SHARED_LIBRARIES := liblog libpower
+LOCAL_SHARED_LIBRARIES := liblog
 LOCAL_STATIC_LIBRARIES := libosi-host
 include $(BUILD_HOST_NATIVE_TEST)
 endif

diff --git a/test/suite/Android.mk b/test/suite/Android.mk
index 8b9df6f..3caec79 100644 (file)
--- a/test/suite/Android.mk
+++ b/test/suite/Android.mk
@@ -42,8 +42,7 @@ LOCAL_SHARED_LIBRARIES += \
     liblog \
     libhardware \
     libhardware_legacy \
-    libcutils \
-    libpower
+    libcutils
 
 LOCAL_STATIC_LIBRARIES += \
   libbtcore \

diff --git a/tools/bdtool/Android.mk b/tools/bdtool/Android.mk
index ff2cec7..7ed5c4a 100644 (file)
--- a/tools/bdtool/Android.mk
+++ b/tools/bdtool/Android.mk
@@ -40,6 +40,6 @@ LOCAL_C_INCLUDES := \
   $(LOCAL_PATH)/../..
 
 LOCAL_SHARED_LIBRARIES += \
-  libhardware liblog libpower
+  libhardware liblog
 
 include $(BUILD_EXECUTABLE)

diff --git a/tools/hci/Android.mk b/tools/hci/Android.mk
index 996c68e..9477db3 100644 (file)
--- a/tools/hci/Android.mk
+++ b/tools/hci/Android.mk
@@ -23,7 +23,6 @@ LOCAL_MODULE := net_hci
 
 LOCAL_SRC_FILES := main.c
 LOCAL_STATIC_LIBRARIES := libosi
-LOCAL_SHARED_LIBRARIES := libpower
 LOCAL_CFLAGS := -std=c99 $(bdroid_CFLAGS)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../