Skip to content

Commit

Permalink
Seperate mk file for adb & fastboot
Browse files Browse the repository at this point in the history
Signed-off-by: Shaka Huang <[email protected]>
  • Loading branch information
shakalaca committed Feb 25, 2017
1 parent 7cab475 commit 73194ba
Show file tree
Hide file tree
Showing 7 changed files with 127 additions and 124 deletions.
3 changes: 1 addition & 2 deletions 03_build_fastboot.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
#!/bin/sh
ndk-build NDK_PROJECT_PATH=. NDK_APPLICATION_MK=Application.mk fastboot

ndk-build NDK_PROJECT_PATH=. NDK_APP_LIBS_OUT=dist NDK_APPLICATION_MK=Application_fastboot.mk
4 changes: 1 addition & 3 deletions 04_build_adb.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
#!/bin/sh
ndk-build NDK_PROJECT_PATH=. NDK_APPLICATION_MK=Application.mk adb


ndk-build NDK_PROJECT_PATH=. NDK_APP_LIBS_OUT=dist NDK_APPLICATION_MK=Application_adb.mk
66 changes: 66 additions & 0 deletions Android_adb.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

LOCAL_MODULE := adb

LOCAL_CPPFLAGS := -std=c++14

LOCAL_CFLAGS := \
-Wno-unknown-attributes \
-fvisibility=hidden \
-Wall -Wextra -Werror \
-Wno-unused-parameter \
-Wno-missing-field-initializers \
-Wvla \
-Wexit-time-destructors \
-DADB_REVISION='"shakalaca-$(shell date +%Y-%m-%d)"' \
-DADB_HOST=1 -DADB_HOST_ON_TARGET=1 -D_GNU_SOURCE

LOCAL_C_INCLUDES := \
src/bionic/libc/include \
src/system/core/adb \
src/system/core/include \
src/system/core/mkbootimg \

LOCAL_SRC_FILES := \
src/system/core/adb/adb.cpp \
src/system/core/adb/adb_auth.cpp \
src/system/core/adb/adb_io.cpp \
src/system/core/adb/adb_listeners.cpp \
src/system/core/adb/adb_trace.cpp \
src/system/core/adb/adb_utils.cpp \
src/system/core/adb/fdevent.cpp \
src/system/core/adb/sockets.cpp \
src/system/core/adb/transport.cpp \
src/system/core/adb/transport_local.cpp \
src/system/core/adb/transport_usb.cpp \
\
src/system/core/adb/get_my_path_linux.cpp \
src/system/core/adb/sysdeps_unix.cpp \
src/system/core/adb/usb_linux.cpp \
\
src/system/core/adb/adb_auth_host.cpp \
\
src/system/core/adb/diagnose_usb.cpp \
\
src/system/core/adb/adb_client.cpp \
src/system/core/adb/bugreport.cpp \
src/system/core/adb/client/main.cpp \
src/system/core/adb/console.cpp \
src/system/core/adb/commandline.cpp \
src/system/core/adb/file_sync_client.cpp \
src/system/core/adb/line_printer.cpp \
src/system/core/adb/services.cpp \
src/system/core/adb/shell_service_protocol.cpp

# libutils
LOCAL_SRC_FILES += \
src/system/core/libutils/FileMap.cpp

LOCAL_STATIC_LIBRARIES := crypto base log cutils usb
LOCAL_CXX_STL := libc++_static

include $(BUILD_EXECUTABLE)

include $(LOCAL_PATH)/Android_library.mk
53 changes: 53 additions & 0 deletions Android_fastboot.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

LOCAL_MODULE := fastboot

LOCAL_CPPFLAGS := -std=c++14

LOCAL_CFLAGS := \
-Wno-unknown-attributes \
-Wall -Wextra -Werror -Wunreachable-code \
-DFASTBOOT_REVISION='"shakalaca-$(shell date +%Y-%m-%d)"' \
-DUSE_F2FS

LOCAL_C_INCLUDES := \
src/system/core/include \
src/system/core/adb \
src/system/core/mkbootimg \
src/system/extras/f2fs_utils \
src/external/gtest/include

LOCAL_SRC_FILES := \
src/system/core/fastboot/bootimg_utils.cpp \
src/system/core/fastboot/engine.cpp \
src/system/core/fastboot/fastboot.cpp \
src/system/core/fastboot/fs.cpp\
src/system/core/fastboot/protocol.cpp \
src/system/core/fastboot/socket.cpp \
src/system/core/fastboot/tcp.cpp \
src/system/core/fastboot/udp.cpp \
src/system/core/fastboot/util.cpp \
src/system/core/fastboot/usb_linux.cpp \
src/system/core/fastboot/util_linux.cpp

# libziparchive
LOCAL_SRC_FILES += \
src/system/core/libziparchive/zip_archive.cc

# libutils
LOCAL_SRC_FILES += \
src/system/core/libutils/FileMap.cpp

# libdiagnose_usb
LOCAL_SRC_FILES += \
src/system/core/adb/diagnose_usb.cpp

LOCAL_LDLIBS += -lz
LOCAL_STATIC_LIBRARIES := selinux ext4_utils f2fs_utils sparse log base cutils usb
LOCAL_CXX_STL := libc++_static

include $(BUILD_EXECUTABLE)

include $(LOCAL_PATH)/Android_library.mk
119 changes: 1 addition & 118 deletions Android.mk → Android_library.mk
Original file line number Diff line number Diff line change
Expand Up @@ -289,121 +289,4 @@ LOCAL_EXPORT_C_INCLUDES := src/boringssl/include
LOCAL_SRC_FILES := src/boringssl/dist/$(TARGET_ARCH_ABI)/libcrypto.a

include $(PREBUILT_STATIC_LIBRARY)

##############################################################################

include $(CLEAR_VARS)
LOCAL_MODULE := fastboot
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := \
src/system/core/include \
src/system/core/adb \
src/system/core/mkbootimg \
src/system/extras/f2fs_utils \
src/external/gtest/include

LOCAL_CPPFLAGS := -std=c++14

LOCAL_CFLAGS := \
-Wno-unknown-attributes \
-Wall -Wextra -Werror -Wunreachable-code \
-DFASTBOOT_REVISION='"shakalaca-$(shell date +%Y-%m-%d)"' \
-DUSE_F2FS

LOCAL_SRC_FILES := \
src/system/core/fastboot/bootimg_utils.cpp \
src/system/core/fastboot/engine.cpp \
src/system/core/fastboot/fastboot.cpp \
src/system/core/fastboot/fs.cpp\
src/system/core/fastboot/protocol.cpp \
src/system/core/fastboot/socket.cpp \
src/system/core/fastboot/tcp.cpp \
src/system/core/fastboot/udp.cpp \
src/system/core/fastboot/util.cpp \
src/system/core/fastboot/usb_linux.cpp \
src/system/core/fastboot/util_linux.cpp

# libziparchive
LOCAL_SRC_FILES += \
src/system/core/libziparchive/zip_archive.cc

# libutils
LOCAL_SRC_FILES += \
src/system/core/libutils/FileMap.cpp

# libdiagnose_usb
LOCAL_SRC_FILES += \
src/system/core/adb/diagnose_usb.cpp

LOCAL_LDLIBS += -lz
LOCAL_STATIC_LIBRARIES := selinux ext4_utils f2fs_utils sparse log base cutils usb
LOCAL_CXX_STL := libc++_static

include $(BUILD_EXECUTABLE)

##############################################################################

include $(CLEAR_VARS)

LOCAL_MODULE := adb

LOCAL_MODULE_TAGS := optional

LOCAL_CPPFLAGS := -std=c++14

LOCAL_CFLAGS := \
-Wno-unknown-attributes \
-fvisibility=hidden \
-Wall -Wextra -Werror \
-Wno-unused-parameter \
-Wno-missing-field-initializers \
-Wvla \
-Wexit-time-destructors \
-DADB_REVISION='"shakalaca-$(shell date +%Y-%m-%d)"' \
-DADB_HOST=1 -DADB_HOST_ON_TARGET=1 -D_GNU_SOURCE

LOCAL_C_INCLUDES := \
src/bionic/libc/include \
src/system/core/adb \
src/system/core/include \
src/system/core/mkbootimg \

LOCAL_SRC_FILES := \
src/system/core/adb/adb.cpp \
src/system/core/adb/adb_auth.cpp \
src/system/core/adb/adb_io.cpp \
src/system/core/adb/adb_listeners.cpp \
src/system/core/adb/adb_trace.cpp \
src/system/core/adb/adb_utils.cpp \
src/system/core/adb/fdevent.cpp \
src/system/core/adb/sockets.cpp \
src/system/core/adb/transport.cpp \
src/system/core/adb/transport_local.cpp \
src/system/core/adb/transport_usb.cpp \
\
src/system/core/adb/get_my_path_linux.cpp \
src/system/core/adb/sysdeps_unix.cpp \
src/system/core/adb/usb_linux.cpp \
\
src/system/core/adb/adb_auth_host.cpp \
\
src/system/core/adb/diagnose_usb.cpp \
\
src/system/core/adb/adb_client.cpp \
src/system/core/adb/bugreport.cpp \
src/system/core/adb/client/main.cpp \
src/system/core/adb/console.cpp \
src/system/core/adb/commandline.cpp \
src/system/core/adb/file_sync_client.cpp \
src/system/core/adb/line_printer.cpp \
src/system/core/adb/services.cpp \
src/system/core/adb/shell_service_protocol.cpp

# libutils
LOCAL_SRC_FILES += \
src/system/core/libutils/FileMap.cpp

LOCAL_STATIC_LIBRARIES := crypto base log cutils usb
LOCAL_CXX_STL := libc++_static

include $(BUILD_EXECUTABLE)
LOCAL_PATH := $(call my-dir)
2 changes: 1 addition & 1 deletion Application.mk → Application_adb.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
APP_PLATFORM := 21
APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
APP_STL := c++_static
APP_BUILD_SCRIPT := Android.mk
APP_BUILD_SCRIPT := Android_adb.mk
4 changes: 4 additions & 0 deletions Application_fastboot.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
APP_PLATFORM := 21
APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
APP_STL := c++_static
APP_BUILD_SCRIPT := Android_fastboot.mk

0 comments on commit 73194ba

Please sign in to comment.