ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Give slightly less useless versions to adb and fastboot."

Browse source 
am: ddfd5056a2

Change-Id: Ia41e72ae4c21b060b9a104a10f4628d24195d915
This commit is contained in:
Elliott Hughes 2017-05-06 05:29:47 +00:00 • committed by android-build-merger
commit 77ca73f8a7
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
adb/Android.mk
View file

@ -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 \

4
fastboot/Android.mk
View file

@ -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