diff options
| author | Ying Wang <wangying@google.com> | 2016-03-01 19:50:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-01 19:50:46 +0000 |
| commit | 3905db7616152f12366e564a00fa0ea442a16556 (patch) | |
| tree | 7fece9a6812a62a036c1f1390ad02557e1c66545 /fastboot | |
| parent | 8baed60b58cefa10205aadd4b718bf622c39abb5 (diff) | |
| parent | aa88fa58371930b9b7aef8d942f72d7b9a29c8a7 (diff) | |
| download | core-3905db7616152f12366e564a00fa0ea442a16556.tar.gz core-3905db7616152f12366e564a00fa0ea442a16556.tar.bz2 core-3905db7616152f12366e564a00fa0ea442a16556.zip | |
Merge "Also archive adb.exe/fastboot.exe when building win_sdk." am: f666ba41a7
am: aa88fa5837
* commit 'aa88fa58371930b9b7aef8d942f72d7b9a29c8a7':
Also archive adb.exe/fastboot.exe when building win_sdk.
Diffstat (limited to 'fastboot')
| -rw-r--r-- | fastboot/Android.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fastboot/Android.mk b/fastboot/Android.mk index a326f55d6..1b4ecbe51 100644 --- a/fastboot/Android.mk +++ b/fastboot/Android.mk @@ -90,7 +90,11 @@ my_dist_files := $(LOCAL_BUILT_MODULE) ifeq ($(HOST_OS),linux) my_dist_files += $(HOST_LIBRARY_PATH)/libf2fs_fmt_host_dyn$(HOST_SHLIB_SUFFIX) endif -$(call dist-for-goals,dist_files sdk,$(my_dist_files)) +$(call dist-for-goals,dist_files sdk win_sdk,$(my_dist_files)) +ifdef HOST_CROSS_OS +# Archive fastboot.exe for win_sdk build. +$(call dist-for-goals,win_sdk,$(ALL_MODULES.host_cross_fastboot.BUILT)) +endif my_dist_files := ifeq ($(HOST_OS),linux) |