From 24eb8a0643d50b636c77ffa8f3e23c7c3a8f5bf9 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 15 Jun 2016 15:12:17 -0700 Subject: Minor minadbd cleanup. Distinguish our "services.cpp" more clearly from the regular adbd "services.cpp", and remove a few useless includes of "sysdeps.h". Change-Id: Ided4945a3ac5916133322ca7e95fa51add9abaa4 --- 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 3db3b4114..b3bbb428c 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -13,7 +13,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ adb_main.cpp \ fuse_adb_provider.cpp \ - services.cpp \ + minadbd_services.cpp \ LOCAL_CLANG := true LOCAL_MODULE := libminadbd -- cgit v1.2.3 From 1675848a39512ad512c530c0e47ccd1ce13f96e5 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 9 Aug 2016 18:46:57 -0700 Subject: adb headers now refer to openssl headers. Change-Id: Icddc4a4f226595338fafbcb14ee9338c58b4a80f --- 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 b3bbb428c..34631a944 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -21,7 +21,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 +LOCAL_STATIC_LIBRARIES := libcrypto libbase include $(BUILD_STATIC_LIBRARY) -- cgit v1.2.3 From acb2a2fa4c415944a27539461ba3757f3edbb128 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Fri, 26 Aug 2016 18:24:34 -0700 Subject: minadbd: rename adb_server_main to minadbd_main. adb_server_main in adb refers to the adb server on the host, not adbd. Since there doesn't seem to be a good reason to reuse the declaration from adb's headers, give minadbd a main function of its own. Change-Id: I748f1a6822dc14c726cb73ef3b533c57a6615608 --- 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 34631a944..7eef13ee0 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -11,8 +11,8 @@ minadbd_cflags := \ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - adb_main.cpp \ fuse_adb_provider.cpp \ + minadbd.cpp \ minadbd_services.cpp \ LOCAL_CLANG := true -- cgit v1.2.3