Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11ff3459 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Minimal changes to build fastboot as a library. 

Bug: http://b/77809061
Test: builds
Change-Id: I0c388334d643a0a2abf0c03a29f336dc3af2f83f
parent 9e8e19a7

fastboot/Android.mk

+71 −62
Original line number Diff line number Diff line
@@ -16,14 +16,35 @@ LOCAL_PATH:= $(call my-dir) 


include $(LOCAL_PATH)/../platform_tools_tool_version.mk



include $(CLEAR_VARS)

fastboot_cflags := -Wall -Wextra -Werror -Wunreachable-code

fastboot_cflags += -DFASTBOOT_VERSION="\"$(tool_version)\""

fastboot_cflags_darwin := -Wno-unused-parameter

fastboot_ldlibs_darwin := -lpthread -framework CoreFoundation -framework IOKit -framework Carbon

fastboot_ldlibs_windows := -lws2_32

# Don't add anything here, we don't want additional shared dependencies

# on the host fastboot tool, and shared libraries that link against libc++

# will violate ODR.

fastboot_shared_libs :=

fastboot_static_libs := \

    libziparchive \

    libsparse \

    libutils \

    liblog \

    libz \

    libdiagnose_usb \

    libbase \

    libcutils \

    libgtest_host \



LOCAL_CFLAGS += -DFASTBOOT_VERSION="\"$(tool_version)\""

fastboot_stl := libc++_static



LOCAL_C_INCLUDES := \

  $(LOCAL_PATH)/../adb \

#

# Build host libfastboot.

#



LOCAL_HEADER_LIBRARIES := bootimg_headers

include $(CLEAR_VARS)

LOCAL_MODULE := libfastboot

LOCAL_MODULE_HOST_OS := darwin linux windows



LOCAL_SRC_FILES := \

    bootimg_utils.cpp \
@@ -36,48 +57,50 @@ LOCAL_SRC_FILES := \ 
    udp.cpp \

    util.cpp \



LOCAL_MODULE := fastboot

LOCAL_MODULE_TAGS := debug

LOCAL_MODULE_HOST_OS := darwin linux windows

LOCAL_CFLAGS += -Wall -Wextra -Werror -Wunreachable-code

LOCAL_REQUIRED_MODULES := mke2fs make_f2fs



LOCAL_SRC_FILES_linux := usb_linux.cpp

LOCAL_STATIC_LIBRARIES_linux := libselinux

LOCAL_REQUIRED_MODULES_linux := e2fsdroid mke2fs.conf sload_f2fs



LOCAL_SRC_FILES_darwin := usb_osx.cpp

LOCAL_STATIC_LIBRARIES_darwin := libselinux

LOCAL_REQUIRED_MODULES_darwin := e2fsdroid mke2fs.conf sload_f2fs

LOCAL_LDLIBS_darwin := -lpthread -framework CoreFoundation -framework IOKit -framework Carbon

LOCAL_CFLAGS_darwin := -Wno-unused-parameter



LOCAL_SRC_FILES_linux := usb_linux.cpp

LOCAL_SRC_FILES_windows := usb_windows.cpp

LOCAL_SHARED_LIBRARIES_windows := AdbWinApi

LOCAL_REQUIRED_MODULES_windows := AdbWinUsbApi

LOCAL_LDLIBS_windows := -lws2_32

LOCAL_C_INCLUDES_windows := development/host/windows/usb/api



LOCAL_STATIC_LIBRARIES := \

    libziparchive \

    libsparse \

    libutils \

    liblog \

    libz \

    libdiagnose_usb \

    libbase \

    libcutils \

    libgtest_host \

LOCAL_C_INCLUDES_windows := development/host/windows/usb/api

LOCAL_CFLAGS := $(fastboot_cflags)

LOCAL_CFLAGS_darwin := $(fastboot_cflags_darwin)

LOCAL_CXX_STL := $(fastboot_stl)

LOCAL_HEADER_LIBRARIES := bootimg_headers

LOCAL_LDLIBS_darwin := $(fastboot_ldflags_darwin)

LOCAL_LDLIBS_windows := $(fastboot_ldlibs_windows)

LOCAL_SHARED_LIBRARIES := $(fastboot_shared_libs)

LOCAL_STATIC_LIBRARIES := $(fastboot_static_libs)

include $(BUILD_HOST_STATIC_LIBRARY)



LOCAL_CXX_STL := libc++_static

#

# Build host fastboot / fastboot.exe

#



# Don't add anything here, we don't want additional shared dependencies

# on the host fastboot tool, and shared libraries that link against libc++

# will violate ODR

LOCAL_SHARED_LIBRARIES :=

include $(CLEAR_VARS)

LOCAL_MODULE := fastboot

LOCAL_MODULE_HOST_OS := darwin linux windows



LOCAL_CFLAGS := $(fastboot_cflags)

LOCAL_CFLAGS_darwin := $(fastboot_cflags_darwin)

LOCAL_CXX_STL := $(fastboot_stl)

LOCAL_LDLIBS_darwin := $(fastboot_ldflags_darwin)

LOCAL_LDLIBS_windows := $(fastboot_ldlibs_windows)

LOCAL_REQUIRED_MODULES := mke2fs make_f2fs

LOCAL_REQUIRED_MODULES_darwin := e2fsdroid mke2fs.conf sload_f2fs

LOCAL_REQUIRED_MODULES_linux := e2fsdroid mke2fs.conf sload_f2fs

LOCAL_REQUIRED_MODULES_windows := AdbWinUsbApi

LOCAL_SRC_FILES := main.cpp

LOCAL_SHARED_LIBRARIES := $(fastboot_shared_libs)

LOCAL_SHARED_LIBRARIES_windows := AdbWinApi

LOCAL_STATIC_LIBRARIES := libfastboot $(fastboot_static_libs)

LOCAL_STATIC_LIBRARIES_darwin := libselinux

LOCAL_STATIC_LIBRARIES_linux := libselinux

include $(BUILD_HOST_EXECUTABLE)



#

# Package fastboot-related executables.

#



my_dist_files := $(HOST_OUT_EXECUTABLES)/fastboot

my_dist_files += $(HOST_OUT_EXECUTABLES)/mke2fs$(HOST_EXECUTABLE_SUFFIX)

my_dist_files += $(HOST_OUT_EXECUTABLES)/e2fsdroid$(HOST_EXECUTABLE_SUFFIX)
@@ -90,38 +113,24 @@ $(call dist-for-goals,win_sdk,$(ALL_MODULES.host_cross_fastboot.BUILT)) 
endif

my_dist_files :=



ifeq ($(HOST_OS),linux)

include $(CLEAR_VARS)

LOCAL_SRC_FILES := usbtest.cpp usb_linux.cpp util.cpp

LOCAL_MODULE := usbtest

LOCAL_CFLAGS := -Werror

LOCAL_STATIC_LIBRARIES := libbase

include $(BUILD_HOST_EXECUTABLE)

endif

#

# Build host fastboot_test.

#



# fastboot_test

# =========================================================

include $(CLEAR_VARS)



LOCAL_MODULE := fastboot_test

LOCAL_MODULE_HOST_OS := darwin linux windows



LOCAL_SRC_FILES := \

    socket.cpp \

    socket_mock.cpp \

    socket_test.cpp \

    tcp.cpp \

    tcp_test.cpp \

    udp.cpp \

    udp_test.cpp \



LOCAL_STATIC_LIBRARIES := libbase libcutils



LOCAL_CFLAGS += -Wall -Wextra -Werror -Wunreachable-code



LOCAL_LDLIBS_darwin := -lpthread -framework CoreFoundation -framework IOKit -framework Carbon

LOCAL_CFLAGS_darwin := -Wno-unused-parameter



LOCAL_LDLIBS_windows := -lws2_32



LOCAL_CFLAGS := $(fastboot_cflags)

LOCAL_CFLAGS_darwin := $(fastboot_cflags_darwin)

LOCAL_CXX_STL := $(fastboot_stl)

LOCAL_LDLIBS_darwin := $(fastboot_ldflags_darwin)

LOCAL_LDLIBS_windows := $(fastboot_ldlibs_windows)

LOCAL_STATIC_LIBRARIES := libfastboot $(fastboot_static_libs)

include $(BUILD_HOST_NATIVE_TEST)

fastboot/engine.cpp

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 


#include <android-base/stringprintf.h>



#include "transport.h"



enum Op {

    OP_DOWNLOAD,

    OP_COMMAND,

fastboot/fastboot.cpp

+1 −2
Original line number Diff line number Diff line
@@ -1410,8 +1410,7 @@ failed: 
    fprintf(stderr, "FAILED (%s)\n", fb_get_error().c_str());

}



int main(int argc, char **argv)

{

int FastBoot::Main(int argc, char* argv[]) {

    bool wants_wipe = false;

    bool wants_reboot = false;

    bool wants_reboot_bootloader = false;

fastboot/fastboot.h

+6 −2
Original line number Diff line number Diff line
@@ -34,8 +34,7 @@ 


#include <string>



#include "transport.h"



class Transport;

struct sparse_file;



/* protocol.c - fastboot protocol */
@@ -97,4 +96,9 @@ void verbose(const char* fmt, ...) __attribute__((__format__(FASTBOOT_FORMAT_ARC 
/* Current product */

extern char cur_product[FB_RESPONSE_SZ + 1];



class FastBoot {

  public:

    int Main(int argc, char* argv[]);

};



#endif

fastboot/main.cpp

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2008 The Android Open Source Project

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *  * Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 *  * Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in

 *    the documentation and/or other materials provided with the

 *    distribution.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS

 * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE

 * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,

 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,

 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS

 * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED

 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,

 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT

 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

 * SUCH DAMAGE.

 */



#include "fastboot.h"



int main(int argc, char* argv[]) {

    FastBoot fb;

    return fb.Main(argc, argv);

}