diff options
Diffstat (limited to 'adb/Android.mk')
-rw-r--r-- | adb/Android.mk | 301 |
1 files changed, 178 insertions, 123 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index b70c153..6951904 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -5,83 +5,180 @@ LOCAL_PATH:= $(call my-dir) -# adb host tool +ifeq ($(HOST_OS),windows) + adb_host_clang := false # libc++ for mingw not ready yet. +else + adb_host_clang := true +endif + +# libadb # ========================================================= + +# Much of adb is duplicated in bootable/recovery/minadb and fastboot. Changes +# made to adb rarely get ported to the other two, so the trees have diverged a +# bit. We'd like to stop this because it is a maintenance nightmare, but the +# divergence makes this difficult to do all at once. For now, we will start +# 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.cpp \ + adb_auth.cpp \ + adb_io.cpp \ + adb_listeners.cpp \ + adb_utils.cpp \ + sockets.cpp \ + transport.cpp \ + transport_local.cpp \ + transport_usb.cpp \ + +LIBADB_TEST_SRCS := \ + adb_io_test.cpp \ + adb_utils_test.cpp \ + transport_test.cpp \ + +LIBADB_CFLAGS := \ + -Wall -Werror \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -fvisibility=hidden \ + +LIBADB_darwin_SRC_FILES := \ + fdevent.cpp \ + get_my_path_darwin.cpp \ + usb_osx.cpp \ + +LIBADB_linux_SRC_FILES := \ + fdevent.cpp \ + get_my_path_linux.cpp \ + usb_linux.cpp \ + +LIBADB_windows_SRC_FILES := \ + get_my_path_windows.cpp \ + sysdeps_win32.cpp \ + usb_windows.cpp \ + +include $(CLEAR_VARS) +LOCAL_CLANG := true +LOCAL_MODULE := libadbd +LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=0 +LOCAL_SRC_FILES := \ + $(LIBADB_SRC_FILES) \ + adb_auth_client.cpp \ + fdevent.cpp \ + jdwp_service.cpp \ + qemu_tracing.cpp \ + usb_linux_client.cpp \ + +LOCAL_SHARED_LIBRARIES := libbase + +include $(BUILD_STATIC_LIBRARY) + include $(CLEAR_VARS) +LOCAL_CLANG := $(adb_host_clang) +LOCAL_MODULE := libadb +LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=1 +LOCAL_SRC_FILES := \ + $(LIBADB_SRC_FILES) \ + $(LIBADB_$(HOST_OS)_SRC_FILES) \ + adb_auth_host.cpp \ + +LOCAL_SHARED_LIBRARIES := libbase -# Default to a virtual (sockets) usb interface -USB_SRCS := -EXTRA_SRCS := +# 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 + +ifeq ($(HOST_OS),windows) + LOCAL_C_INCLUDES += development/host/windows/usb/api/ +endif + +include $(BUILD_HOST_STATIC_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_CLANG := true +LOCAL_MODULE := adbd_test +LOCAL_CFLAGS := -DADB_HOST=0 $(LIBADB_CFLAGS) +LOCAL_SRC_FILES := $(LIBADB_TEST_SRCS) +LOCAL_STATIC_LIBRARIES := libadbd +LOCAL_SHARED_LIBRARIES := liblog libbase libcutils +include $(BUILD_NATIVE_TEST) + +include $(CLEAR_VARS) +LOCAL_CLANG := $(adb_host_clang) +LOCAL_MODULE := adb_test +LOCAL_CFLAGS := -DADB_HOST=1 $(LIBADB_CFLAGS) +LOCAL_SRC_FILES := $(LIBADB_TEST_SRCS) services.cpp +LOCAL_SHARED_LIBRARIES := liblog libbase +LOCAL_STATIC_LIBRARIES := \ + libadb \ + libcrypto_static \ + libcutils \ ifeq ($(HOST_OS),linux) - USB_SRCS := usb_linux.c - EXTRA_SRCS := get_my_path_linux.c LOCAL_LDLIBS += -lrt -ldl -lpthread - LOCAL_CFLAGS += -DWORKAROUND_BUG6558362 endif ifeq ($(HOST_OS),darwin) - USB_SRCS := usb_osx.c - EXTRA_SRCS := get_my_path_darwin.c - LOCAL_LDLIBS += -lpthread -framework CoreFoundation -framework IOKit -framework Carbon + LOCAL_LDLIBS += -framework CoreFoundation -framework IOKit +endif + +include $(BUILD_HOST_NATIVE_TEST) + +# adb host tool +# ========================================================= +include $(CLEAR_VARS) + +ifeq ($(HOST_OS),linux) + LOCAL_LDLIBS += -lrt -ldl -lpthread + LOCAL_CFLAGS += -DWORKAROUND_BUG6558362 endif -ifeq ($(HOST_OS),freebsd) - USB_SRCS := usb_libusb.c - EXTRA_SRCS := get_my_path_freebsd.c - LOCAL_LDLIBS += -lpthread -lusb +ifeq ($(HOST_OS),darwin) + LOCAL_LDLIBS += -lpthread -framework CoreFoundation -framework IOKit -framework Carbon + LOCAL_CFLAGS += -Wno-sizeof-pointer-memaccess -Wno-unused-parameter endif ifeq ($(HOST_OS),windows) - USB_SRCS := usb_windows.c - EXTRA_SRCS := get_my_path_windows.c + LOCAL_LDLIBS += -lws2_32 -lgdi32 EXTRA_STATIC_LIBS := AdbWinApi - ifneq ($(strip $(USE_CYGWIN)),) - # Pure cygwin case - LOCAL_LDLIBS += -lpthread -lgdi32 - endif - ifneq ($(strip $(USE_MINGW)),) - # MinGW under Linux case - LOCAL_LDLIBS += -lws2_32 -lgdi32 - USE_SYSDEPS_WIN32 := 1 - endif - LOCAL_C_INCLUDES += development/host/windows/usb/api/ endif +LOCAL_CLANG := $(adb_host_clang) + LOCAL_SRC_FILES := \ - adb.c \ - console.c \ - transport.c \ - transport_local.c \ - transport_usb.c \ - commandline.c \ - adb_client.c \ - adb_auth_host.c \ - sockets.c \ - services.c \ - file_sync_client.c \ - $(EXTRA_SRCS) \ - $(USB_SRCS) \ - usb_vendors.c - -LOCAL_C_INCLUDES += external/openssl/include - -ifneq ($(USE_SYSDEPS_WIN32),) - LOCAL_SRC_FILES += sysdeps_win32.c -else - LOCAL_SRC_FILES += fdevent.c -endif + adb_main.cpp \ + console.cpp \ + commandline.cpp \ + adb_client.cpp \ + services.cpp \ + file_sync_client.cpp \ + +LOCAL_CFLAGS += \ + -Wall -Werror \ + -Wno-unused-parameter \ + -D_GNU_SOURCE \ + -DADB_HOST=1 \ -LOCAL_CFLAGS += -O2 -g -DADB_HOST=1 -Wall -Wno-unused-parameter -Werror -LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE LOCAL_MODULE := adb LOCAL_MODULE_TAGS := debug -LOCAL_STATIC_LIBRARIES := libzipfile libunz libcrypto_static $(EXTRA_STATIC_LIBS) -ifeq ($(USE_SYSDEPS_WIN32),) - LOCAL_STATIC_LIBRARIES += libcutils +LOCAL_STATIC_LIBRARIES := \ + libadb \ + libbase \ + libcrypto_static \ + libcutils \ + $(EXTRA_STATIC_LIBS) \ + +# libc++ not available on windows yet +ifneq ($(HOST_OS),windows) + LOCAL_CXX_STL := libc++_static endif +# Don't add anything here, we don't want additional shared dependencies +# on the host adb tool, and shared libraries that link against libc++ +# will violate ODR +LOCAL_SHARED_LIBRARIES := + include $(BUILD_HOST_EXECUTABLE) $(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE)) @@ -98,30 +195,28 @@ endif include $(CLEAR_VARS) +LOCAL_CLANG := true + LOCAL_SRC_FILES := \ - adb.c \ - fdevent.c \ - transport.c \ - transport_local.c \ - transport_usb.c \ - adb_auth_client.c \ - sockets.c \ - services.c \ - file_sync_service.c \ - jdwp_service.c \ - framebuffer_service.c \ - remount_service.c \ - disable_verity_service.c \ - usb_linux_client.c - -LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter -Werror -LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE + adb_main.cpp \ + services.cpp \ + file_sync_service.cpp \ + framebuffer_service.cpp \ + remount_service.cpp \ + set_verity_enable_state_service.cpp \ + +LOCAL_CFLAGS := \ + -DADB_HOST=0 \ + -D_GNU_SOURCE \ + -Wall -Werror \ + -Wno-unused-parameter \ + -Wno-deprecated-declarations \ ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) LOCAL_CFLAGS += -DALLOW_ADBD_ROOT=1 endif -ifneq (,$(filter userdebug,$(TARGET_BUILD_VARIANT))) +ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) LOCAL_CFLAGS += -DALLOW_ADBD_DISABLE_VERITY=1 endif @@ -130,57 +225,17 @@ LOCAL_MODULE := adbd LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN) LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED) -LOCAL_C_INCLUDES += system/extras/ext4_utils system/core/fs_mgr/include - -LOCAL_STATIC_LIBRARIES := liblog \ - libfs_mgr \ - libcutils \ - libc \ - libmincrypt \ - libselinux \ - libext4_utils_static +LOCAL_C_INCLUDES += system/extras/ext4_utils + +LOCAL_STATIC_LIBRARIES := \ + libadbd \ + libbase \ + libfs_mgr \ + liblog \ + libcutils \ + libc \ + libmincrypt \ + libselinux \ + libext4_utils_static \ include $(BUILD_EXECUTABLE) - - -# adb host tool for device-as-host -# ========================================================= -ifneq ($(SDK_ONLY),true) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - adb.c \ - console.c \ - transport.c \ - transport_local.c \ - transport_usb.c \ - commandline.c \ - adb_client.c \ - adb_auth_host.c \ - sockets.c \ - services.c \ - file_sync_client.c \ - get_my_path_linux.c \ - usb_linux.c \ - usb_vendors.c \ - fdevent.c - -LOCAL_CFLAGS := \ - -O2 \ - -g \ - -DADB_HOST=1 \ - -DADB_HOST_ON_TARGET=1 \ - -Wall -Wno-unused-parameter -Werror \ - -D_XOPEN_SOURCE \ - -D_GNU_SOURCE - -LOCAL_C_INCLUDES += external/openssl/include - -LOCAL_MODULE := adb - -LOCAL_STATIC_LIBRARIES := libzipfile libunz libcutils liblog - -LOCAL_SHARED_LIBRARIES := libcrypto - -include $(BUILD_EXECUTABLE) -endif |