From 4039933c62f52dda06e6f355cf42ac9b392d0888 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 1 May 2015 17:07:44 -0700 Subject: Move minadb over to new API. Change-Id: I889bcf2222245c7665287513669cae8831e37081 --- minadbd/Android.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'minadbd/Android.mk') diff --git a/minadbd/Android.mk b/minadbd/Android.mk index cbfd76e4e..8398cefe4 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -20,6 +20,7 @@ LOCAL_CFLAGS := $(minadbd_cflags) LOCAL_CONLY_FLAGS := -Wimplicit-function-declaration LOCAL_C_INCLUDES := bootable/recovery system/core/adb LOCAL_WHOLE_STATIC_LIBRARIES := libadbd +LOCAL_STATIC_LIBRARIES := libbase include $(BUILD_STATIC_LIBRARY) @@ -31,6 +32,6 @@ LOCAL_SRC_FILES := fuse_adb_provider_test.cpp LOCAL_CFLAGS := $(minadbd_cflags) LOCAL_C_INCLUDES := $(LOCAL_PATH) system/core/adb LOCAL_STATIC_LIBRARIES := libminadbd -LOCAL_SHARED_LIBRARIES := liblog +LOCAL_SHARED_LIBRARIES := liblog libbase include $(BUILD_NATIVE_TEST) -- cgit v1.2.3 From dbb20c48633e63c7c244e84f3fea76e083e225d7 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 1 May 2015 22:29:01 -0700 Subject: Fix mips64 minadbd_test build. Looks like the mips64 linker isn't as good as the others at GCing unused stuff, which means it needs libcutils. Change-Id: I5f768e44514350fb81e5360351db3e9cc4201702 --- minadbd/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'minadbd/Android.mk') diff --git a/minadbd/Android.mk b/minadbd/Android.mk index 8398cefe4..a7a3e087d 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -32,6 +32,6 @@ LOCAL_SRC_FILES := fuse_adb_provider_test.cpp LOCAL_CFLAGS := $(minadbd_cflags) LOCAL_C_INCLUDES := $(LOCAL_PATH) system/core/adb LOCAL_STATIC_LIBRARIES := libminadbd -LOCAL_SHARED_LIBRARIES := liblog libbase +LOCAL_SHARED_LIBRARIES := liblog libbase libcutils include $(BUILD_NATIVE_TEST) -- cgit v1.2.3 From 80e46e08de5f65702fa7f7cd3ef83f905d919bbc Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Wed, 3 Jun 2015 10:49:29 -0700 Subject: recovery: Switch to clang And a few trival fixes to suppress warnings. Change-Id: I38734b5f4434643e85feab25f4807b46a45d8d65 --- minadbd/Android.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'minadbd/Android.mk') diff --git a/minadbd/Android.mk b/minadbd/Android.mk index a7a3e087d..3db3b4114 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -15,6 +15,7 @@ LOCAL_SRC_FILES := \ fuse_adb_provider.cpp \ services.cpp \ +LOCAL_CLANG := true LOCAL_MODULE := libminadbd LOCAL_CFLAGS := $(minadbd_cflags) LOCAL_CONLY_FLAGS := -Wimplicit-function-declaration -- cgit v1.2.3