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

Commit 6f4d4743 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Show the "platform tools" version in adb/fastboot --version."

parents cdad92fd 4d4f64ff

adb/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 


LOCAL_PATH:= $(call my-dir)



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



adb_host_sanitize :=

adb_target_sanitize :=
@@ -13,7 +15,7 @@ ADB_COMMON_CFLAGS := \ 
    -Wno-unused-parameter \

    -Wno-missing-field-initializers \

    -Wvla \

    -DADB_REVISION=\"$(BUILD_NUMBER_FROM_FILE)\" \

    -DADB_VERSION=\"$(tool_version)\" \



ADB_COMMON_posix_CFLAGS := \

    -Wexit-time-destructors \

adb/adb.cpp

+2 −2
Original line number Diff line number Diff line
@@ -64,9 +64,9 @@ std::string adb_version() { 
    // Don't change the format of this --- it's parsed by ddmlib.

    return android::base::StringPrintf(

        "Android Debug Bridge version %d.%d.%d\n"

        "Revision %s\n"

        "Version %s\n"

        "Installed as %s\n",

        ADB_VERSION_MAJOR, ADB_VERSION_MINOR, ADB_SERVER_VERSION, ADB_REVISION,

        ADB_VERSION_MAJOR, ADB_VERSION_MINOR, ADB_SERVER_VERSION, ADB_VERSION,

        android::base::GetExecutablePath().c_str());

}

adb/daemon/main.cpp

+2 −3
Original line number Diff line number Diff line
@@ -233,9 +233,8 @@ int main(int argc, char** argv) { 
            adb_device_banner = optarg;

            break;

        case 'v':

            printf("Android Debug Bridge Daemon version %d.%d.%d %s\n",

                   ADB_VERSION_MAJOR, ADB_VERSION_MINOR, ADB_SERVER_VERSION,

                   ADB_REVISION);

            printf("Android Debug Bridge Daemon version %d.%d.%d (%s)\n", ADB_VERSION_MAJOR,

                   ADB_VERSION_MINOR, ADB_SERVER_VERSION, ADB_VERSION);

            return 0;

        default:

            // getopt already prints "adbd: invalid option -- %c" for us.

fastboot/Android.mk

+4 −2
Original line number Diff line number Diff line
@@ -14,8 +14,12 @@ 


LOCAL_PATH:= $(call my-dir)



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



include $(CLEAR_VARS)



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



LOCAL_C_INCLUDES := \

  $(LOCAL_PATH)/../adb \

  $(LOCAL_PATH)/../mkbootimg \
@@ -37,8 +41,6 @@ LOCAL_MODULE_TAGS := debug 
LOCAL_MODULE_HOST_OS := darwin linux windows

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



LOCAL_CFLAGS += -DFASTBOOT_REVISION=\"$(BUILD_NUMBER_FROM_FILE)\"



LOCAL_SRC_FILES_linux := usb_linux.cpp

LOCAL_STATIC_LIBRARIES_linux := libselinux

fastboot/fastboot.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1544,7 +1544,7 @@ int main(int argc, char **argv) 
                setvbuf(stdout, nullptr, _IONBF, 0);

                setvbuf(stderr, nullptr, _IONBF, 0);

            } else if (strcmp("version", longopts[longindex].name) == 0) {

                fprintf(stdout, "fastboot version %s\n", FASTBOOT_REVISION);

                fprintf(stdout, "fastboot version %s\n", FASTBOOT_VERSION);

                fprintf(stdout, "Installed as %s\n", android::base::GetExecutablePath().c_str());

                return 0;

            } else if (strcmp("slot", longopts[longindex].name) == 0) {