diff options
| author | Dan Albert <danalbert@google.com> | 2015-02-19 13:19:42 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-02-19 13:49:35 -0800 |
| commit | e1ca623faa278a264981b088fb608b2a62727ab1 (patch) | |
| tree | 81c01189c7ee6aabeb321862235106181c4f26a3 /adb/Android.mk | |
| parent | 9a525d7f2e050a81fd800557293fc3ce6d4933ff (diff) | |
| download | system_core-e1ca623faa278a264981b088fb608b2a62727ab1.tar.gz system_core-e1ca623faa278a264981b088fb608b2a62727ab1.tar.bz2 system_core-e1ca623faa278a264981b088fb608b2a62727ab1.zip | |
Lose adb.c and sockets.c to libadb.
Also kill the device side libadb. This was added for the now dead
device side adb, and is no longer used.
Bug: 17626262
Change-Id: I3b28915641fd5b4f16fc86cf1f4f4e9711093001
Diffstat (limited to 'adb/Android.mk')
| -rw-r--r-- | adb/Android.mk | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index 7ff455521..6d18d2657 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -15,8 +15,10 @@ LOCAL_PATH:= $(call my-dir) # small by moving common files into a static library. Hopefully some day we can # get enough of adb in here that we no longer need minadb. https://b/17626262 LIBADB_SRC_FILES := \ + adb.c \ adb_auth.c \ adb_listeners.c \ + sockets.c \ transport.c \ transport_usb.c \ @@ -34,6 +36,8 @@ LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=0 LOCAL_SRC_FILES := \ $(LIBADB_SRC_FILES) \ $(LIBADB_LINUX_SRC_FILES) \ + adb_auth_client.c \ + jdwp_service.c \ qemu_tracing.c \ usb_linux_client.c \ @@ -42,13 +46,14 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := libadb LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=1 -LOCAL_SRC_FILES := $(LIBADB_SRC_FILES) $(LIBADB_LINUX_SRC_FILES) -include $(BUILD_STATIC_LIBRARY) +LOCAL_SRC_FILES := \ + $(LIBADB_SRC_FILES) \ + adb_auth_host.c \ + +# Even though we're building a static library (and thus there's no link step for +# this to take effect), this adds the SSL includes to our path. +LOCAL_STATIC_LIBRARIES := libcrypto_static -include $(CLEAR_VARS) -LOCAL_MODULE := libadb -LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=1 -LOCAL_SRC_FILES := $(LIBADB_SRC_FILES) ifeq ($(HOST_OS),windows) LOCAL_SRC_FILES += $(LIBADB_WINDOWS_SRC_FILES) else @@ -91,14 +96,11 @@ ifeq ($(HOST_OS),windows) endif LOCAL_SRC_FILES := \ - adb.c \ adb_main.c \ console.c \ transport_local.c \ commandline.c \ adb_client.c \ - adb_auth_host.c \ - sockets.c \ services.c \ file_sync_client.c \ $(EXTRA_SRCS) \ @@ -141,14 +143,10 @@ endif include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - adb.c \ adb_main.c \ transport_local.c \ - adb_auth_client.c \ - sockets.c \ services.c \ file_sync_service.c \ - jdwp_service.c \ framebuffer_service.c \ remount_service.c \ set_verity_enable_state_service.c \ |