Fix adb version and fastboot --version output

nmeum · Feb 13, 2019 · cde6167 · cde6167
1 parent 735eb7a
commit cde6167
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 45 deletions.
diff --git a/patches/core/0008-Quote-ADB_VERSION-in-adb.cpp.patch b/patches/core/0008-Quote-ADB_VERSION-in-adb.cpp.patch
diff --git a/patches/core/0010-Quote-FASTBOOT_VERSION-in-fastboot.cpp.patch b/patches/core/0010-Quote-FASTBOOT_VERSION-in-fastboot.cpp.patch
diff --git a/vendor/CMakeLists.adb.txt b/vendor/CMakeLists.adb.txt
@@ -95,7 +95,7 @@ add_executable(adb
 	  core/adb/adb_auth_host.cpp
 	  core/adb/shell_service_protocol.cpp)
 
-target_compile_definitions(adb PRIVATE -DADB_VERSION=${ANDROID_VERSION})
+target_compile_definitions(adb PRIVATE -DADB_VERSION="${ANDROID_VERSION}")
 target_include_directories(adb PRIVATE
 	core/include core/base/include core/adb
 	core/libcrypto_utils/include boringssl/include)

diff --git a/vendor/CMakeLists.fastboot.txt b/vendor/CMakeLists.fastboot.txt
@@ -108,6 +108,7 @@ target_include_directories(fastboot PRIVATE
 	extras/ext4_utils/include extras/f2fs_utils
 	core/libziparchive/include core/mkbootimg/include/bootimg)
 target_compile_definitions(fastboot PRIVATE
+	-DFASTBOOT_VERSION="${ANDROID_VERSION}"
 	-D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS
 	-DANDROID_MKE2FS_NAME="${ANDROID_MKE2FS_NAME}")
 target_link_libraries(fastboot