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

Commit cd81886b authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Fix build error when (ADB|FASTBOOT)_VERSION has space" am: 3d29736d am: f2f3c3b9 

am: 8ff4dbe4

Change-Id: I1598a1aa314a2ec550596a4f92390a71d9cd6137
parents 8a30d83a 8ff4dbe4

adb/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ ADB_COMMON_CFLAGS := \ 
    -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

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ include $(LOCAL_PATH)/../platform_tools_tool_version.mk 


include $(CLEAR_VARS)



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

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



LOCAL_C_INCLUDES := \

  $(LOCAL_PATH)/../adb \