Merge "Revert "Add Asuite prebuilds in PATH and remove functions."" (aaf8cdf5) · Commits · e / os / android_build

envsetup.sh

+52 −8

Original line number	Diff line number	Diff line
		@@ -267,13 +267,6 @@ function setpaths()
		export ANDROID_EMULATOR_PREBUILTS
		fi

		# Append asuite prebuilts path to ANDROID_BUILD_PATHS.
		local os_arch=$(get_build_var HOST_PREBUILT_TAG)
		local ACLOUD_PATH="$T/prebuilts/asuite/acloud/$os_arch:"
		local AIDEGEN_PATH="$T/prebuilts/asuite/aidegen/$os_arch:"
		local ATEST_PATH="$T/prebuilts/asuite/atest/$os_arch:"
		export ANDROID_BUILD_PATHS=$ANDROID_BUILD_PATHS$ACLOUD_PATH$AIDEGEN_PATH$ATEST_PATH

		export PATH=$ANDROID_BUILD_PATHS$PATH

		# out with the duplicate old
		@@ -362,7 +355,7 @@ function addcompletions()
		local completion_files=(
		system/core/adb/adb.bash
		system/core/fastboot/fastboot.bash
		tools/asuite/asuite.sh
		tools/tradefederation/core/atest/atest_completion.sh
		)
		# Completion can be disabled selectively to allow users to use non-standard completion.
		# e.g.
		@@ -1685,6 +1678,23 @@ function provision()
		"$ANDROID_PRODUCT_OUT/provision-device" "$@"
		}

		function atest()
		{
		# Let's use the built version over the prebuilt, then source code.
		local os_arch=$(get_build_var HOST_PREBUILT_TAG)
		local built_atest=${ANDROID_HOST_OUT}/bin/atest
		local prebuilt_atest="$(gettop)"/prebuilts/asuite/atest/$os_arch/atest
		if [[ -x $built_atest ]]; then
		$built_atest "$@"
		elif [[ -x $prebuilt_atest ]]; then
		$prebuilt_atest "$@"
		else
		# TODO: once prebuilt atest released, remove the source code section
		# and change the location of atest_completion.sh in addcompletions().
		"$(gettop)"/tools/tradefederation/core/atest/atest.py "$@"
		fi
		}

		# Zsh needs bashcompinit called to support bash-style completion.
		function enable_zsh_completion() {
		# Don't override user's options if bash-style completion is already enabled.
		@@ -1709,6 +1719,40 @@ function validate_current_shell() {
		esac
		}

		function acloud()
		{
		# Let's use the built version over the prebuilt.
		local built_acloud=${ANDROID_HOST_OUT}/bin/acloud
		if [ -f $built_acloud ]; then
		$built_acloud "$@"
		return $?
		fi

		local host_os_arch=$(get_build_var HOST_PREBUILT_TAG)
		case $host_os_arch in
		linux-x86) "$(gettop)"/prebuilts/asuite/acloud/linux-x86/acloud "$@"
		;;
		darwin-x86) "$(gettop)"/prebuilts/asuite/acloud/darwin-x86/acloud "$@"
		;;
		*)
		echo "acloud is not supported on your host arch: $host_os_arch"
		;;
		esac
		}

		function aidegen()
		{
		# Always use the prebuilt version.
		local host_os_arch=$(get_build_var HOST_PREBUILT_TAG)
		case $host_os_arch in
		linux-x86) "$(gettop)"/prebuilts/asuite/aidegen/linux-x86/aidegen "$@"
		;;
		*)
		echo "aidegen is not supported on your host arch: $host_os_arch"
		;;
		esac
		}

		# Execute the contents of any vendorsetup.sh files we can find.
		function source_vendorsetup() {
		for dir in device vendor product; do