Add libpower as a dependency to all device targets that include libosi.
Bug: 23902077
Change-Id: Icc7119a2b3199310e2210d46f599da00261fdff6
diff --git a/system/audio_a2dp_hw/Android.mk b/system/audio_a2dp_hw/Android.mk
index e745d0c..8581941 100644
--- a/system/audio_a2dp_hw/Android.mk
+++ b/system/audio_a2dp_hw/Android.mk
@@ -15,7 +15,7 @@
LOCAL_MODULE := audio.a2dp.default
LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_SHARED_LIBRARIES := liblog
+LOCAL_SHARED_LIBRARIES := liblog libpower
LOCAL_STATIC_LIBRARIES := libosi
LOCAL_MODULE_TAGS := optional
diff --git a/system/btcore/Android.mk b/system/btcore/Android.mk
index aa07cbe..8c9e1f1 100644
--- a/system/btcore/Android.mk
+++ b/system/btcore/Android.mk
@@ -86,7 +86,7 @@
LOCAL_CFLAGS := -Wall -Werror -Werror=unused-variable
LOCAL_MODULE := net_test_btcore
LOCAL_MODULE_TAGS := tests
-LOCAL_SHARED_LIBRARIES := liblog
+LOCAL_SHARED_LIBRARIES := liblog libpower
LOCAL_STATIC_LIBRARIES := libbtcore libosi
include $(BUILD_NATIVE_TEST)
diff --git a/system/device/Android.mk b/system/device/Android.mk
index 56d303f..88632be 100644
--- a/system/device/Android.mk
+++ b/system/device/Android.mk
@@ -67,7 +67,7 @@
LOCAL_CFLAGS := -Wall -Werror -Werror=unused-variable
LOCAL_MODULE := net_test_device
LOCAL_MODULE_TAGS := tests
-LOCAL_SHARED_LIBRARIES := liblog libdl
+LOCAL_SHARED_LIBRARIES := liblog libdl libpower
LOCAL_STATIC_LIBRARIES := libbtdevice libbtcore libosi libcutils
include $(BUILD_NATIVE_TEST)
diff --git a/system/main/Android.mk b/system/main/Android.mk
index 7a7fb77..ff7b4a5 100644
--- a/system/main/Android.mk
+++ b/system/main/Android.mk
@@ -130,6 +130,7 @@
libcutils \
libdl \
liblog \
+ libpower \
libz
LOCAL_STATIC_LIBRARIES := \
diff --git a/system/osi/Android.mk b/system/osi/Android.mk
index a108559..6954cb4 100644
--- a/system/osi/Android.mk
+++ b/system/osi/Android.mk
@@ -83,7 +83,7 @@
LOCAL_CLANG_CFLAGS += -Wno-error=typedef-redefinition
LOCAL_MODULE := libosi
LOCAL_MODULE_TAGS := optional
-LOCAL_SHARED_LIBRARIES := libc liblog
+LOCAL_SHARED_LIBRARIES := libc liblog libpower
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
include $(BUILD_STATIC_LIBRARY)
diff --git a/system/osi/src/compat.c b/system/osi/src/compat.c
index ea26c18..4e6f869 100644
--- a/system/osi/src/compat.c
+++ b/system/osi/src/compat.c
@@ -30,7 +30,9 @@
#include <sys/syscall.h>
#include <sys/types.h>
#include <unistd.h>
+
#include "osi/include/compat.h"
+#include "osi/include/osi.h"
#if __GLIBC__
pid_t
@@ -129,3 +131,8 @@
return (dlen + (s - src)); /* count does not include NUL */
}
#endif
+
+#if _GNU_SOURCE
+int acquire_wake_lock(UNUSED_ATTR int lock, UNUSED_ATTR const char *id) { return strlen(id); }
+int release_wake_lock(UNUSED_ATTR const char *id) { return 0; }
+#endif
diff --git a/system/test/suite/Android.mk b/system/test/suite/Android.mk
index 3caec79..6dc45e3 100644
--- a/system/test/suite/Android.mk
+++ b/system/test/suite/Android.mk
@@ -42,6 +42,7 @@
liblog \
libhardware \
libhardware_legacy \
+ libpower \
libcutils
LOCAL_STATIC_LIBRARIES += \
diff --git a/system/tools/bdtool/Android.mk b/system/tools/bdtool/Android.mk
index 7ed5c4a..ff2cec7 100644
--- a/system/tools/bdtool/Android.mk
+++ b/system/tools/bdtool/Android.mk
@@ -40,6 +40,6 @@
$(LOCAL_PATH)/../..
LOCAL_SHARED_LIBRARIES += \
- libhardware liblog
+ libhardware liblog libpower
include $(BUILD_EXECUTABLE)
diff --git a/system/tools/hci/Android.mk b/system/tools/hci/Android.mk
index 9477db3..996c68e 100644
--- a/system/tools/hci/Android.mk
+++ b/system/tools/hci/Android.mk
@@ -23,6 +23,7 @@
LOCAL_SRC_FILES := main.c
LOCAL_STATIC_LIBRARIES := libosi
+LOCAL_SHARED_LIBRARIES := libpower
LOCAL_CFLAGS := -std=c99 $(bdroid_CFLAGS)
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../
