diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-04-09 14:26:23 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2018-04-09 14:26:23 -0700 |
| commit | 94e4dc26bbb8a587d6b6abb7993650eb651a05e4 (patch) | |
| tree | f97f8fb5e6d92da08a9ce65f8ecf7761a1e4710d /fastboot | |
| parent | 7ff06150c11fdc40a1c2d61ed07540b15bea62af (diff) | |
| download | system_core-94e4dc26bbb8a587d6b6abb7993650eb651a05e4.tar.gz system_core-94e4dc26bbb8a587d6b6abb7993650eb651a05e4.tar.bz2 system_core-94e4dc26bbb8a587d6b6abb7993650eb651a05e4.zip | |
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
Diffstat (limited to 'fastboot')
| -rw-r--r-- | fastboot/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fastboot/Android.mk b/fastboot/Android.mk index 944b00b16..b69ce56ff 100644 --- a/fastboot/Android.mk +++ b/fastboot/Android.mk @@ -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) |