Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 748012b2 authored by Bart Sears's avatar Bart Sears
Browse files

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

This reverts commit 43109958.

Change-Id: If682757bca55ecc0057bdd058b654ecbdcc7e50a
parent 43109958

system/audio_a2dp_hw/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

system/btcore/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -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

system/device/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)

system/main/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ LOCAL_SHARED_LIBRARIES := \ 
    libcutils \

    libdl \

    liblog \

    libpower \

    libz



LOCAL_STATIC_LIBRARIES := \

system/osi/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -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