diff options
| author | Dan Albert <danalbert@google.com> | 2015-05-05 17:46:50 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-05-06 09:11:16 -0700 |
| commit | c1cfbd304ad1f4f5f136a175ed687de41701235a (patch) | |
| tree | a1bbaaae91c8409c1a5f3ac554decfdd6d52d1da /adb/Android.mk | |
| parent | b0481f48091d77f21492cc2f717308412091bc02 (diff) | |
| download | system_core-c1cfbd304ad1f4f5f136a175ed687de41701235a.tar.gz system_core-c1cfbd304ad1f4f5f136a175ed687de41701235a.tar.bz2 system_core-c1cfbd304ad1f4f5f136a175ed687de41701235a.zip | |
Include the git sha in the adb version.
Also add --version to adbd to display the same thing.
Change-Id: I47dfbad16c892c42ea938aedd085ba77492791ba
(cherry picked from commit 1ba1d7c1ee644967ff4743b0d257290cbeca7a83)
Diffstat (limited to 'adb/Android.mk')
| -rw-r--r-- | adb/Android.mk | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index dd1343b49..1613a88e4 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -11,6 +11,13 @@ else adb_host_clang := true endif +adb_version := $(shell git -C $(LOCAL_PATH) rev-parse --short=12 HEAD 2>/dev/null)-android + +ADB_COMMON_CFLAGS := \ + -Wall -Werror \ + -Wno-unused-parameter \ + -DADB_REVISION='"$(adb_version)"' \ + # libadb # ========================================================= @@ -37,8 +44,7 @@ LIBADB_TEST_SRCS := \ transport_test.cpp \ LIBADB_CFLAGS := \ - -Wall -Werror \ - -Wno-unused-parameter \ + $(ADB_COMMON_CFLAGS) \ -Wno-missing-field-initializers \ -fvisibility=hidden \ @@ -169,8 +175,7 @@ LOCAL_SRC_FILES := \ file_sync_client.cpp \ LOCAL_CFLAGS += \ - -Wall -Werror \ - -Wno-unused-parameter \ + $(ADB_COMMON_CFLAGS) \ -D_GNU_SOURCE \ -DADB_HOST=1 \ @@ -222,10 +227,9 @@ LOCAL_SRC_FILES := \ set_verity_enable_state_service.cpp \ LOCAL_CFLAGS := \ + $(ADB_COMMON_CFLAGS) \ -DADB_HOST=0 \ -D_GNU_SOURCE \ - -Wall -Werror \ - -Wno-unused-parameter \ -Wno-deprecated-declarations \ ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) |