commit 78d150eb3261c53e58f4a9079a114f09096615af
author Elliott Hughes <enh@google.com> Wed May 10 17:01:50 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 10 17:01:50 2017 +0000
tree a91380b05b5cd5a615cac85c2468c13053d2f3bf
parent 60ea6e55fec8d21b970bb3c55c575b9807ec8942
parent 8bc49f58e364f52b711a8626e484e26a43554204

Merge "Fix build error when (ADB|FASTBOOT)_VERSION has space" am: 3d29736d6b am: f2f3c3b91c am: 8ff4dbe443
am: cd81886b94

Change-Id: Icd8b12444f496c177d5aedcae624a2662c5e960c

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index c31b116..dc87bb0 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -15,7 +15,7 @@
     -Wno-unused-parameter \
     -Wno-missing-field-initializers \
     -Wvla \
-    -DADB_VERSION=\"$(tool_version)\" \
+    -DADB_VERSION="\"$(tool_version)\""
 
 ADB_COMMON_posix_CFLAGS := \
     -Wexit-time-destructors \

fastboot/Android.mk

diff --git a/fastboot/Android.mk b/fastboot/Android.mk
index 4d54175..80def73 100644
--- a/fastboot/Android.mk
+++ b/fastboot/Android.mk
@@ -18,7 +18,7 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_CFLAGS += -DFASTBOOT_VERSION=\"$(tool_version)\"
+LOCAL_CFLAGS += -DFASTBOOT_VERSION="\"$(tool_version)\""
 
 LOCAL_C_INCLUDES := \
   $(LOCAL_PATH)/../adb \