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

Commit aa88fa58 authored Mar 01, 2016 by Ying Wang Committed by android-build-merger Mar 01, 2016

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

am: f666ba41

* commit 'f666ba41':
  Also archive adb.exe/fastboot.exe when building win_sdk.

parents 126527e7 f666ba41

adb/Android.mk

+5 −1

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

		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

fastboot/Android.mk

+5 −1

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