ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Also archive adb.exe/fastboot.exe when building win_sdk."

Browse source 
am: f666ba41a7

* commit 'f666ba41a729834bf15296ab13a92f33c5b0d592':
  Also archive adb.exe/fastboot.exe when building win_sdk.
This commit is contained in:
Ying Wang 2016-03-01 17:30:05 +00:00 • committed by android-build-merger
commit aa88fa5837
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
adb/Android.mk
View file

@ -288,7 +288,11 @@ LOCAL_SHARED_LIBRARIES :=
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)
$(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE)) $(call dist-for-goals,dist_files sdk win_sdk,$(LOCAL_BUILT_MODULE))
ifdef HOST_CROSS_OS
# Archive adb.exe for win_sdk build.
$(call dist-for-goals,win_sdk,$(ALL_MODULES.host_cross_adb.BUILT))
endif
# adbd device daemon # adbd device daemon

6
fastboot/Android.mk
View file

@ -90,7 +90,11 @@ my_dist_files := $(LOCAL_BUILT_MODULE)
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
my_dist_files += $(HOST_LIBRARY_PATH)/libf2fs_fmt_host_dyn$(HOST_SHLIB_SUFFIX) my_dist_files += $(HOST_LIBRARY_PATH)/libf2fs_fmt_host_dyn$(HOST_SHLIB_SUFFIX)
endif 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 := my_dist_files :=
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)