From a01ce3a229aa5d696a282be13d693c7597cfba2f Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Mon, 24 Nov 2014 23:32:33 -0800 Subject: Start losing code to libadb. Bug: 17626262 Change-Id: I8ce7cff2b7789f39f35a4211d7120d072c05a863 --- minadbd/Android.mk | 3 --- 1 file changed, 3 deletions(-) (limited to 'minadbd/Android.mk') diff --git a/minadbd/Android.mk b/minadbd/Android.mk index 04956d870..c07715706 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -12,7 +12,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ adb.c \ - fdevent.c \ fuse_adb_provider.c \ transport.c \ transport_usb.c \ @@ -27,6 +26,4 @@ LOCAL_C_INCLUDES += bootable/recovery LOCAL_MODULE := libminadbd -LOCAL_STATIC_LIBRARIES := libfusesideload libcutils libc - include $(BUILD_STATIC_LIBRARY) -- cgit v1.2.3 From 8f1bfead3f77f16ac3e85ef1d5e0008e52848e79 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Tue, 25 Nov 2014 10:55:50 -0800 Subject: Lose USB transport code to libadb. Bug: 17626262 Change-Id: If41031ba20a3a75fa510f155c654a482b47e409d --- minadbd/Android.mk | 3 --- 1 file changed, 3 deletions(-) (limited to 'minadbd/Android.mk') diff --git a/minadbd/Android.mk b/minadbd/Android.mk index c07715706..8de1b7453 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -13,11 +13,8 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ adb.c \ fuse_adb_provider.c \ - transport.c \ - transport_usb.c \ sockets.c \ services.c \ - usb_linux_client.c \ utils.c LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter -- cgit v1.2.3 From 2b2a14ff3528b1b65e78b4d2bbb2dd2fb0c326c5 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Wed, 18 Feb 2015 14:24:48 -0800 Subject: Remove unused code. Change-Id: Ie37734e75bc4d1e284dcb5dee4c0512021663dbd --- minadbd/Android.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'minadbd/Android.mk') diff --git a/minadbd/Android.mk b/minadbd/Android.mk index 8de1b7453..0f1634bb2 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -15,7 +15,6 @@ LOCAL_SRC_FILES := \ fuse_adb_provider.c \ sockets.c \ services.c \ - utils.c LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE -- cgit v1.2.3 From 1ddd35050417b79307c5e0a989ee39d6ce2bfc1b Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Wed, 18 Feb 2015 15:58:15 -0800 Subject: Use headers from adb. adb.h has diverged a bit, so that one will be more involved, but these three are all trivial, unimportant changes. Change-Id: Ief8474c1c2927d7e955adf04f887c76ab37077a6 --- 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 0f1634bb2..fecce8777 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -18,7 +18,7 @@ LOCAL_SRC_FILES := \ LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE -LOCAL_C_INCLUDES += bootable/recovery +LOCAL_C_INCLUDES := bootable/recovery system/core/adb LOCAL_MODULE := libminadbd -- cgit v1.2.3 From 9a894b7ece585e4254eb7879508bccd53802e6d7 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Wed, 18 Feb 2015 18:36:08 -0800 Subject: Move adb_main to its own file. Change-Id: Ia5150e1ef8be5a8f2d2da0fdca9383e22218f4ac --- 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 fecce8777..0cba0c5f1 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -12,6 +12,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ adb.c \ + adb_main.c \ fuse_adb_provider.c \ sockets.c \ services.c \ -- cgit v1.2.3 From f3a5726919ce35d3f5e628e9561496470195ac1f Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 19 Feb 2015 13:21:14 -0800 Subject: Kill of most of the remainder of minadbd. I think everything left now is here to stay (services.c might get massaged in to libadbd if it gets refactored). Bug: 17626262 Change-Id: I01faf8b277a601a40e3a0f4c3b8206c97f1d2ce6 --- minadbd/Android.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'minadbd/Android.mk') diff --git a/minadbd/Android.mk b/minadbd/Android.mk index 0cba0c5f1..f4b060b47 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -11,15 +11,14 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - adb.c \ adb_main.c \ fuse_adb_provider.c \ - sockets.c \ services.c \ LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE LOCAL_C_INCLUDES := bootable/recovery system/core/adb +LOCAL_WHOLE_STATIC_LIBRARIES := libadbd LOCAL_MODULE := libminadbd -- cgit v1.2.3 From 8f6eb5c045896d13b411ab8906f9af8e2f258b5a Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Tue, 24 Feb 2015 22:07:18 -0800 Subject: Fix build from implicit declaration. Turn the warning on by default and turn on -Werror so this doesn't happen next time. Change-Id: Id65bf0cb63bbf0ff224655b425463ae2f55435df --- minadbd/Android.mk | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'minadbd/Android.mk') diff --git a/minadbd/Android.mk b/minadbd/Android.mk index f4b060b47..dce004feb 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -1,22 +1,22 @@ # Copyright 2005 The Android Open Source Project -# -# Android.mk for adb -# LOCAL_PATH:= $(call my-dir) -# minadbd library -# ========================================================= - include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - adb_main.c \ - fuse_adb_provider.c \ - services.c \ + adb_main.c \ + fuse_adb_provider.c \ + services.c \ + +LOCAL_CFLAGS := \ + -Wall -Werror \ + -Wno-unused-parameter \ + -Wimplicit-function-declaration \ + -D_GNU_SOURCE \ + -D_XOPEN_SOURCE \ + -DADB_HOST=0 \ -LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter -LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE LOCAL_C_INCLUDES := bootable/recovery system/core/adb LOCAL_WHOLE_STATIC_LIBRARIES := libadbd -- cgit v1.2.3 From 24043705895d4ec170490d7d2761443d264f14a4 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Tue, 24 Feb 2015 22:41:07 -0800 Subject: Remove _(GNU|XOPEN)_SORUCE makefile cruft. None of the functions needing these are used. Change-Id: Ibe3ca24d993788bf2f1108bac8417a7094ef386b --- minadbd/Android.mk | 2 -- 1 file changed, 2 deletions(-) (limited to 'minadbd/Android.mk') diff --git a/minadbd/Android.mk b/minadbd/Android.mk index dce004feb..24b043ee3 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -13,8 +13,6 @@ LOCAL_CFLAGS := \ -Wall -Werror \ -Wno-unused-parameter \ -Wimplicit-function-declaration \ - -D_GNU_SOURCE \ - -D_XOPEN_SOURCE \ -DADB_HOST=0 \ LOCAL_C_INCLUDES := bootable/recovery system/core/adb -- cgit v1.2.3 From ffd6c31a770618eff6354b65ba7352f4da116055 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 26 Feb 2015 15:33:00 -0800 Subject: Add tests for read_block_adb. These tests aren't completely representative in that they don't run in the recovery image. We might want to look in to adding a self-test option to the recovery UI. Until then, these can be run on a normal device (which is easier to do anyway). Bug: 19522788 Change-Id: Idb20feb55d10c62905c2480ab1b61a2e4b5f60d8 --- minadbd/Android.mk | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) (limited to 'minadbd/Android.mk') diff --git a/minadbd/Android.mk b/minadbd/Android.mk index 24b043ee3..79fe96b93 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -2,6 +2,12 @@ LOCAL_PATH:= $(call my-dir) +minadbd_cflags := \ + -Wall -Werror \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -DADB_HOST=0 \ + include $(CLEAR_VARS) LOCAL_SRC_FILES := \ @@ -9,15 +15,22 @@ LOCAL_SRC_FILES := \ fuse_adb_provider.c \ services.c \ -LOCAL_CFLAGS := \ - -Wall -Werror \ - -Wno-unused-parameter \ - -Wimplicit-function-declaration \ - -DADB_HOST=0 \ - +LOCAL_MODULE := libminadbd +LOCAL_CFLAGS := $(minadbd_cflags) +LOCAL_CONLY_FLAGS := -Wimplicit-function-declaration LOCAL_C_INCLUDES := bootable/recovery system/core/adb LOCAL_WHOLE_STATIC_LIBRARIES := libadbd -LOCAL_MODULE := libminadbd - include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) + +LOCAL_CLANG := true +LOCAL_MODULE := minadbd_test +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 libutils + +include $(BUILD_NATIVE_TEST) -- cgit v1.2.3 From b2f945932c3cd89138b8dcfacd880c627dfed370 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 13 Mar 2015 22:33:38 -0700 Subject: Remove unused libutils references. Change-Id: I22797643103ce1d4371198433ad9849cc83d3d7c --- 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 79fe96b93..52d3fa4e4 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -31,6 +31,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 libutils +LOCAL_SHARED_LIBRARIES := liblog include $(BUILD_NATIVE_TEST) -- cgit v1.2.3 From 20531ef60524e6205b1d9a6c12a8335c5d97e311 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 10 Apr 2015 13:59:19 -0700 Subject: Switch minadb over to C++. Change-Id: I5afaf70caa590525627c676c88b445d3162de33e --- minadbd/Android.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'minadbd/Android.mk') diff --git a/minadbd/Android.mk b/minadbd/Android.mk index 52d3fa4e4..cbfd76e4e 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -11,9 +11,9 @@ minadbd_cflags := \ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - adb_main.c \ - fuse_adb_provider.c \ - services.c \ + adb_main.cpp \ + fuse_adb_provider.cpp \ + services.cpp \ LOCAL_MODULE := libminadbd LOCAL_CFLAGS := $(minadbd_cflags) -- cgit v1.2.3 From 87ec73a264530f5fa19cde2598d5e65c4c67a686 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 1 May 2015 17:25:24 -0700 Subject: Fix minadb_test build breakage. Change-Id: I98bb900debb7d7dd57d3f8f84d605163ec192b03 (cherry picked from commit 3e7d82c621240bb80f9882c64377c4f5f3d97c7b) --- 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 cbfd76e4e..083063be1 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -31,6 +31,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 15931924e1820d4c2bc9f9c0c7734c43c92b866b 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 (cherry picked from commit 4039933c62f52dda06e6f355cf42ac9b392d0888) --- 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 083063be1..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) -- cgit v1.2.3 From 4cf34d5d297db4f7130a7f1472c394e38ea0e642 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 (cherry picked from commit dbb20c48633e63c7c244e84f3fea76e083e225d7) --- 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