diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-30 17:32:03 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-05-01 17:09:34 -0700 |
| commit | 92af733ee202caa3b5475fe27fcc81582f11e7c8 (patch) | |
| tree | 0e5d4bc49cc6299f80a0cccd4ba205d5dfcbb3cb /adb/Android.mk | |
| parent | 5cffd971997ace97ebfd2ecb7d43a64c03cf3169 (diff) | |
| download | system_core-92af733ee202caa3b5475fe27fcc81582f11e7c8.zip system_core-92af733ee202caa3b5475fe27fcc81582f11e7c8.tar.gz system_core-92af733ee202caa3b5475fe27fcc81582f11e7c8.tar.bz2 | |
More adb buffer fixes.
This patch factors out a lot of the basic protocol code: sending OKAY,
sending FAIL, and sending a length-prefixed string.
ADB_TRACE has been non-optional for a long time, so let's just remove
the #ifs.
Also actually build the device tracker test tool (and remove its duplicate).
Bug: http://b/20666660
Change-Id: I6c7d59f18707bdc62ca69dea45547617f9f31fc6
(cherry picked from commit e67f1f87d9b1188ec8617035db7006c37ee7b21e)
Diffstat (limited to 'adb/Android.mk')
| -rw-r--r-- | adb/Android.mk | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index 9b6e147..dd1343b 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -124,6 +124,21 @@ endif include $(BUILD_HOST_NATIVE_TEST) +# adb device tracker (used by ddms) test tool +# ========================================================= + +ifeq ($(HOST_OS),linux) +include $(CLEAR_VARS) +LOCAL_CLANG := $(adb_host_clang) +LOCAL_MODULE := adb_device_tracker_test +LOCAL_CFLAGS := -DADB_HOST=1 $(LIBADB_CFLAGS) +LOCAL_SRC_FILES := test_track_devices.cpp +LOCAL_SHARED_LIBRARIES := liblog libbase +LOCAL_STATIC_LIBRARIES := libadb libcrypto_static libcutils +LOCAL_LDLIBS += -lrt -ldl -lpthread +include $(BUILD_HOST_EXECUTABLE) +endif + # adb host tool # ========================================================= include $(CLEAR_VARS) |