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

Commit 2708a953 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Give slightly less useless versions to adb and fastboot. 

This will let us see (a) whether the user has a legit build or something they
built themselves and (b) what Android release it corresponds to.

This isn't as useful as showing what Platform Tools release we correspond to,
but I'm planning on doing that as a separate line.

Bug: N/A
Test: adb --version ; fastboot --version
Change-Id: Idca489295e3c6f8571146f95822c08808e36b382
parent 484acce0

adb/Android.mk

+1 −3
Original line number Original line Diff line number Diff line
@@ -8,14 +8,12 @@ LOCAL_PATH:= $(call my-dir) 
adb_host_sanitize :=

adb_host_sanitize :=

adb_target_sanitize :=

adb_target_sanitize :=





adb_version := $(shell git -C $(LOCAL_PATH) rev-parse --short=12 HEAD 2>/dev/null)-android



ADB_COMMON_CFLAGS := \

ADB_COMMON_CFLAGS := \

    -Wall -Wextra -Werror \

    -Wall -Wextra -Werror \

    -Wno-unused-parameter \

    -Wno-unused-parameter \

    -Wno-missing-field-initializers \

    -Wno-missing-field-initializers \

    -Wvla \

    -Wvla \

    -DADB_REVISION='"$(adb_version)"' \

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





ADB_COMMON_posix_CFLAGS := \

ADB_COMMON_posix_CFLAGS := \

    -Wexit-time-destructors \

    -Wexit-time-destructors \

fastboot/Android.mk

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




LOCAL_PATH:= $(call my-dir)

LOCAL_PATH:= $(call my-dir)





fastboot_version := $(shell git -C $(LOCAL_PATH) rev-parse --short=12 HEAD 2>/dev/null)-android



include $(CLEAR_VARS)

include $(CLEAR_VARS)





LOCAL_C_INCLUDES := \

LOCAL_C_INCLUDES := \
@@ -39,7 +37,7 @@ LOCAL_MODULE_TAGS := debug 
LOCAL_MODULE_HOST_OS := darwin linux windows

LOCAL_MODULE_HOST_OS := darwin linux windows

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

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





LOCAL_CFLAGS += -DFASTBOOT_REVISION='"$(fastboot_version)"'

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





LOCAL_SRC_FILES_linux := usb_linux.cpp

LOCAL_SRC_FILES_linux := usb_linux.cpp

LOCAL_STATIC_LIBRARIES_linux := libselinux

LOCAL_STATIC_LIBRARIES_linux := libselinux