Commit 94e4dc26 authored Apr 09, 2018 by Dan Willemsen

Fix fastboot dist to be compatible with adb

We've got an internal target 'static_sdk_tools' that attempts to ensure
that both adb and fastboot are distributed as artifacts. It's
essentially a loop calling dist-for-goals on
$(HOST_OUT_EXECUTABLES)/{adb,fastboot}.

The dist-for-goals macro has de-duplication checks, but both the src and
dest needs to be identical. Currently adb is using the installed
executable, fastboot is using the built executable, and static_sdk_tools
is trying to use the installed versions of both.

This causes an overriding commands for target warning, which I recently
turned into a warning.

Maybe everything should be converted over to using the built
executables, but that requires a bunch more checks everywhere, and most
places are already using the installed version.

Bug: 77775726
Test: check treehugger, fastboot is dist
Test: m BUILD_HOST_static=1 static_sdk_tools dist
Change-Id: If45fb9706fa75a812610224708b5f95f65b1f1bf

parent 7ff06150

fastboot/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ LOCAL_SHARED_LIBRARIES :=

		include $(BUILD_HOST_EXECUTABLE)

		my_dist_files := $(LOCAL_BUILT_MODULE)
		my_dist_files := $(HOST_OUT_EXECUTABLES)/fastboot
		my_dist_files += $(HOST_OUT_EXECUTABLES)/mke2fs$(HOST_EXECUTABLE_SUFFIX)
		my_dist_files += $(HOST_OUT_EXECUTABLES)/e2fsdroid$(HOST_EXECUTABLE_SUFFIX)
		my_dist_files += $(HOST_OUT_EXECUTABLES)/make_f2fs$(HOST_EXECUTABLE_SUFFIX)