Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71edfc8b authored Feb 29, 2016 by Ying Wang

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

On linux we archive both Linux and Windows binaries.

Bug: 27315911
Change-Id: I17d25cd1ea611a9c917f1e78b47f21a8959eea20

parent 68de85bd

adb/Android.mk

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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

fastboot/Android.mk

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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)