platform_build/cogsetup.sh

92 lines
3.1 KiB
Bash
Raw Normal View History

#
# Copyright (C) 2023 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# This file is executed by build/envsetup.sh, and can use anything
# defined in envsetup.sh.
function _create_out_symlink_for_cog() {
if [[ "${OUT_DIR}" == "" ]]; then
OUT_DIR="out"
fi
if [[ -L "${OUT_DIR}" ]]; then
return
fi
if [ -d "${OUT_DIR}" ]; then
echo -e "\tOutput directory ${OUT_DIR} cannot be present in a Cog workspace."
echo -e "\tDelete \"${OUT_DIR}\" or create a symlink from \"${OUT_DIR}\" to a directory outside your workspace."
return 1
fi
DEFAULT_OUTPUT_DIR="${HOME}/.cog/android-build-out"
mkdir -p ${DEFAULT_OUTPUT_DIR}
ln -s ${DEFAULT_OUTPUT_DIR} `pwd`/out
}
# This function moves the reclient binaries into a directory that exists in a
# non-cog part of the overall filesystem. This is to workaround the problem
# described in b/289391270.
function _copy_reclient_binaries_from_cog() {
Copy reclient binaries into the out directory itself This is to avoid the problem of multiple source commands / builds run in parallel overwriting the binaries in the reclient dir. TESTED=ran concurrent builds, ensured binaries weren't being overwritten. Bug: b/302378775 NOTE FOR REVIEWERS - original patch and result patch are not identical. PLEASE REVIEW CAREFULLY. Diffs between the patches: fi + local RECLIENT_VERSION=`readlink prebuilts/remoteexecution-client/live` + + local NONCOG_RECLIENT_BIN_DIR_BASE="${OUT_DIR}/.reclient" + local NONCOG_RECLIENT_BIN_DIR="${NONCOG_RECLIENT_BIN_DIR_BASE}/${RECLIENT_VERSION}" + if [ -d "${NONCOG_RECLIENT_BIN_DIR}" ]; then + if [ `ls ${NONCOG_RECLIENT_BIN_DIR} | wc -l` -gt 1 ] ; then + # binaries already exist, only update the symlink to ensure correct + # reclient version is set. + ln -sf ${RECLIENT_VERSION} ${NONCOG_RECLIENT_BIN_DIR_BASE}/live + return + fi + # Create the non cog directory and copy binaries into it. + mkdir -p ${NONCOG_RECLIENT_BIN_DIR} - - # Copy the binaries out of live. - cp $TOP/prebuilts/remoteexecution-client/live/* $NONCOG_RECLIENT_BIN_DIR + cp ${TOP}/prebuilts/remoteexecution-client/live/* ${NONCOG_RECLIENT_BIN_DIR} + ln -sf ${RECLIENT_VERSION} ${NONCOG_RECLIENT_BIN_DIR_BASE}/live - export RBE_DIR=$NONCOG_RECLIENT_BIN_DIR + export RBE_DIR="${NONCOG_RECLIENT_BIN_DIR_BASE}/live" Original patch: diff a/cogsetup.sh b/cogsetup.sh --- a/cogsetup.sh +++ b/cogsetup.sh @@ -39,22 +39,30 @@ # non-cog part of the overall filesystem. This is to workaround the problem # described in b/289391270. function _copy_reclient_binaries_from_cog() { - local NONCOG_RECLIENT_BIN_DIR="${HOME}/.cog/reclient/bin" - if [ ! -d "$NONCOG_RECLIENT_BIN_DIR" ]; then - # Create the non cog directory if it doesn't exist. - mkdir -p ${NONCOG_RECLIENT_BIN_DIR} - else - # Clear out the non cog directory if it does exist. - rm -f ${NONCOG_RECLIENT_BIN_DIR}/* + if [[ "${OUT_DIR}" == "" ]]; then + OUT_DIR="out" fi + local RECLIENT_VERSION=`readlink prebuilts/remoteexecution-client/live` - local TOP=$(gettop) + local NONCOG_RECLIENT_BIN_DIR_BASE="${OUT_DIR}/.reclient" + local NONCOG_RECLIENT_BIN_DIR="${NONCOG_RECLIENT_BIN_DIR_BASE}/${RECLIENT_VERSION}" + if [ -d "${NONCOG_RECLIENT_BIN_DIR}" ]; then + if [ `ls ${NONCOG_RECLIENT_BIN_DIR} | wc -l` -gt 1 ] ; then + # binaries already exist, only update t Change-Id: Ia6cb7faae6366ee7491fcf91777318b772a3ba88
2023-09-28 19:46:59 +02:00
if [[ "${OUT_DIR}" == "" ]]; then
OUT_DIR="out"
fi
Copy reclient binaries into the out directory itself This is to avoid the problem of multiple source commands / builds run in parallel overwriting the binaries in the reclient dir. TESTED=ran concurrent builds, ensured binaries weren't being overwritten. Bug: b/302378775 NOTE FOR REVIEWERS - original patch and result patch are not identical. PLEASE REVIEW CAREFULLY. Diffs between the patches: fi + local RECLIENT_VERSION=`readlink prebuilts/remoteexecution-client/live` + + local NONCOG_RECLIENT_BIN_DIR_BASE="${OUT_DIR}/.reclient" + local NONCOG_RECLIENT_BIN_DIR="${NONCOG_RECLIENT_BIN_DIR_BASE}/${RECLIENT_VERSION}" + if [ -d "${NONCOG_RECLIENT_BIN_DIR}" ]; then + if [ `ls ${NONCOG_RECLIENT_BIN_DIR} | wc -l` -gt 1 ] ; then + # binaries already exist, only update the symlink to ensure correct + # reclient version is set. + ln -sf ${RECLIENT_VERSION} ${NONCOG_RECLIENT_BIN_DIR_BASE}/live + return + fi + # Create the non cog directory and copy binaries into it. + mkdir -p ${NONCOG_RECLIENT_BIN_DIR} - - # Copy the binaries out of live. - cp $TOP/prebuilts/remoteexecution-client/live/* $NONCOG_RECLIENT_BIN_DIR + cp ${TOP}/prebuilts/remoteexecution-client/live/* ${NONCOG_RECLIENT_BIN_DIR} + ln -sf ${RECLIENT_VERSION} ${NONCOG_RECLIENT_BIN_DIR_BASE}/live - export RBE_DIR=$NONCOG_RECLIENT_BIN_DIR + export RBE_DIR="${NONCOG_RECLIENT_BIN_DIR_BASE}/live" Original patch: diff a/cogsetup.sh b/cogsetup.sh --- a/cogsetup.sh +++ b/cogsetup.sh @@ -39,22 +39,30 @@ # non-cog part of the overall filesystem. This is to workaround the problem # described in b/289391270. function _copy_reclient_binaries_from_cog() { - local NONCOG_RECLIENT_BIN_DIR="${HOME}/.cog/reclient/bin" - if [ ! -d "$NONCOG_RECLIENT_BIN_DIR" ]; then - # Create the non cog directory if it doesn't exist. - mkdir -p ${NONCOG_RECLIENT_BIN_DIR} - else - # Clear out the non cog directory if it does exist. - rm -f ${NONCOG_RECLIENT_BIN_DIR}/* + if [[ "${OUT_DIR}" == "" ]]; then + OUT_DIR="out" fi + local RECLIENT_VERSION=`readlink prebuilts/remoteexecution-client/live` - local TOP=$(gettop) + local NONCOG_RECLIENT_BIN_DIR_BASE="${OUT_DIR}/.reclient" + local NONCOG_RECLIENT_BIN_DIR="${NONCOG_RECLIENT_BIN_DIR_BASE}/${RECLIENT_VERSION}" + if [ -d "${NONCOG_RECLIENT_BIN_DIR}" ]; then + if [ `ls ${NONCOG_RECLIENT_BIN_DIR} | wc -l` -gt 1 ] ; then + # binaries already exist, only update t Change-Id: Ia6cb7faae6366ee7491fcf91777318b772a3ba88
2023-09-28 19:46:59 +02:00
local RECLIENT_VERSION=`readlink prebuilts/remoteexecution-client/live`
Copy reclient binaries into the out directory itself This is to avoid the problem of multiple source commands / builds run in parallel overwriting the binaries in the reclient dir. TESTED=ran concurrent builds, ensured binaries weren't being overwritten. Bug: b/302378775 NOTE FOR REVIEWERS - original patch and result patch are not identical. PLEASE REVIEW CAREFULLY. Diffs between the patches: fi + local RECLIENT_VERSION=`readlink prebuilts/remoteexecution-client/live` + + local NONCOG_RECLIENT_BIN_DIR_BASE="${OUT_DIR}/.reclient" + local NONCOG_RECLIENT_BIN_DIR="${NONCOG_RECLIENT_BIN_DIR_BASE}/${RECLIENT_VERSION}" + if [ -d "${NONCOG_RECLIENT_BIN_DIR}" ]; then + if [ `ls ${NONCOG_RECLIENT_BIN_DIR} | wc -l` -gt 1 ] ; then + # binaries already exist, only update the symlink to ensure correct + # reclient version is set. + ln -sf ${RECLIENT_VERSION} ${NONCOG_RECLIENT_BIN_DIR_BASE}/live + return + fi + # Create the non cog directory and copy binaries into it. + mkdir -p ${NONCOG_RECLIENT_BIN_DIR} - - # Copy the binaries out of live. - cp $TOP/prebuilts/remoteexecution-client/live/* $NONCOG_RECLIENT_BIN_DIR + cp ${TOP}/prebuilts/remoteexecution-client/live/* ${NONCOG_RECLIENT_BIN_DIR} + ln -sf ${RECLIENT_VERSION} ${NONCOG_RECLIENT_BIN_DIR_BASE}/live - export RBE_DIR=$NONCOG_RECLIENT_BIN_DIR + export RBE_DIR="${NONCOG_RECLIENT_BIN_DIR_BASE}/live" Original patch: diff a/cogsetup.sh b/cogsetup.sh --- a/cogsetup.sh +++ b/cogsetup.sh @@ -39,22 +39,30 @@ # non-cog part of the overall filesystem. This is to workaround the problem # described in b/289391270. function _copy_reclient_binaries_from_cog() { - local NONCOG_RECLIENT_BIN_DIR="${HOME}/.cog/reclient/bin" - if [ ! -d "$NONCOG_RECLIENT_BIN_DIR" ]; then - # Create the non cog directory if it doesn't exist. - mkdir -p ${NONCOG_RECLIENT_BIN_DIR} - else - # Clear out the non cog directory if it does exist. - rm -f ${NONCOG_RECLIENT_BIN_DIR}/* + if [[ "${OUT_DIR}" == "" ]]; then + OUT_DIR="out" fi + local RECLIENT_VERSION=`readlink prebuilts/remoteexecution-client/live` - local TOP=$(gettop) + local NONCOG_RECLIENT_BIN_DIR_BASE="${OUT_DIR}/.reclient" + local NONCOG_RECLIENT_BIN_DIR="${NONCOG_RECLIENT_BIN_DIR_BASE}/${RECLIENT_VERSION}" + if [ -d "${NONCOG_RECLIENT_BIN_DIR}" ]; then + if [ `ls ${NONCOG_RECLIENT_BIN_DIR} | wc -l` -gt 1 ] ; then + # binaries already exist, only update t Change-Id: Ia6cb7faae6366ee7491fcf91777318b772a3ba88
2023-09-28 19:46:59 +02:00
local NONCOG_RECLIENT_BIN_DIR_BASE="${OUT_DIR}/.reclient"
local NONCOG_RECLIENT_BIN_DIR="${NONCOG_RECLIENT_BIN_DIR_BASE}/${RECLIENT_VERSION}"
Copy reclient binaries into the out directory itself This is to avoid the problem of multiple source commands / builds run in parallel overwriting the binaries in the reclient dir. TESTED=ran concurrent builds, ensured binaries weren't being overwritten. Bug: b/302378775 NOTE FOR REVIEWERS - original patch and result patch are not identical. PLEASE REVIEW CAREFULLY. Diffs between the patches: fi + local RECLIENT_VERSION=`readlink prebuilts/remoteexecution-client/live` + + local NONCOG_RECLIENT_BIN_DIR_BASE="${OUT_DIR}/.reclient" + local NONCOG_RECLIENT_BIN_DIR="${NONCOG_RECLIENT_BIN_DIR_BASE}/${RECLIENT_VERSION}" + if [ -d "${NONCOG_RECLIENT_BIN_DIR}" ]; then + if [ `ls ${NONCOG_RECLIENT_BIN_DIR} | wc -l` -gt 1 ] ; then + # binaries already exist, only update the symlink to ensure correct + # reclient version is set. + ln -sf ${RECLIENT_VERSION} ${NONCOG_RECLIENT_BIN_DIR_BASE}/live + return + fi + # Create the non cog directory and copy binaries into it. + mkdir -p ${NONCOG_RECLIENT_BIN_DIR} - - # Copy the binaries out of live. - cp $TOP/prebuilts/remoteexecution-client/live/* $NONCOG_RECLIENT_BIN_DIR + cp ${TOP}/prebuilts/remoteexecution-client/live/* ${NONCOG_RECLIENT_BIN_DIR} + ln -sf ${RECLIENT_VERSION} ${NONCOG_RECLIENT_BIN_DIR_BASE}/live - export RBE_DIR=$NONCOG_RECLIENT_BIN_DIR + export RBE_DIR="${NONCOG_RECLIENT_BIN_DIR_BASE}/live" Original patch: diff a/cogsetup.sh b/cogsetup.sh --- a/cogsetup.sh +++ b/cogsetup.sh @@ -39,22 +39,30 @@ # non-cog part of the overall filesystem. This is to workaround the problem # described in b/289391270. function _copy_reclient_binaries_from_cog() { - local NONCOG_RECLIENT_BIN_DIR="${HOME}/.cog/reclient/bin" - if [ ! -d "$NONCOG_RECLIENT_BIN_DIR" ]; then - # Create the non cog directory if it doesn't exist. - mkdir -p ${NONCOG_RECLIENT_BIN_DIR} - else - # Clear out the non cog directory if it does exist. - rm -f ${NONCOG_RECLIENT_BIN_DIR}/* + if [[ "${OUT_DIR}" == "" ]]; then + OUT_DIR="out" fi + local RECLIENT_VERSION=`readlink prebuilts/remoteexecution-client/live` - local TOP=$(gettop) + local NONCOG_RECLIENT_BIN_DIR_BASE="${OUT_DIR}/.reclient" + local NONCOG_RECLIENT_BIN_DIR="${NONCOG_RECLIENT_BIN_DIR_BASE}/${RECLIENT_VERSION}" + if [ -d "${NONCOG_RECLIENT_BIN_DIR}" ]; then + if [ `ls ${NONCOG_RECLIENT_BIN_DIR} | wc -l` -gt 1 ] ; then + # binaries already exist, only update t Change-Id: Ia6cb7faae6366ee7491fcf91777318b772a3ba88
2023-09-28 19:46:59 +02:00
# Create the non cog directory and setup live symlink.
mkdir -p ${NONCOG_RECLIENT_BIN_DIR}
if [ `ls ${NONCOG_RECLIENT_BIN_DIR} | wc -l` -lt 8 ]; then
# Not all binaries exist, copy them from the Cog directory.
local TOP=$(gettop)
cp ${TOP}/prebuilts/remoteexecution-client/live/* ${NONCOG_RECLIENT_BIN_DIR}
fi
Copy reclient binaries into the out directory itself This is to avoid the problem of multiple source commands / builds run in parallel overwriting the binaries in the reclient dir. TESTED=ran concurrent builds, ensured binaries weren't being overwritten. Bug: b/302378775 NOTE FOR REVIEWERS - original patch and result patch are not identical. PLEASE REVIEW CAREFULLY. Diffs between the patches: fi + local RECLIENT_VERSION=`readlink prebuilts/remoteexecution-client/live` + + local NONCOG_RECLIENT_BIN_DIR_BASE="${OUT_DIR}/.reclient" + local NONCOG_RECLIENT_BIN_DIR="${NONCOG_RECLIENT_BIN_DIR_BASE}/${RECLIENT_VERSION}" + if [ -d "${NONCOG_RECLIENT_BIN_DIR}" ]; then + if [ `ls ${NONCOG_RECLIENT_BIN_DIR} | wc -l` -gt 1 ] ; then + # binaries already exist, only update the symlink to ensure correct + # reclient version is set. + ln -sf ${RECLIENT_VERSION} ${NONCOG_RECLIENT_BIN_DIR_BASE}/live + return + fi + # Create the non cog directory and copy binaries into it. + mkdir -p ${NONCOG_RECLIENT_BIN_DIR} - - # Copy the binaries out of live. - cp $TOP/prebuilts/remoteexecution-client/live/* $NONCOG_RECLIENT_BIN_DIR + cp ${TOP}/prebuilts/remoteexecution-client/live/* ${NONCOG_RECLIENT_BIN_DIR} + ln -sf ${RECLIENT_VERSION} ${NONCOG_RECLIENT_BIN_DIR_BASE}/live - export RBE_DIR=$NONCOG_RECLIENT_BIN_DIR + export RBE_DIR="${NONCOG_RECLIENT_BIN_DIR_BASE}/live" Original patch: diff a/cogsetup.sh b/cogsetup.sh --- a/cogsetup.sh +++ b/cogsetup.sh @@ -39,22 +39,30 @@ # non-cog part of the overall filesystem. This is to workaround the problem # described in b/289391270. function _copy_reclient_binaries_from_cog() { - local NONCOG_RECLIENT_BIN_DIR="${HOME}/.cog/reclient/bin" - if [ ! -d "$NONCOG_RECLIENT_BIN_DIR" ]; then - # Create the non cog directory if it doesn't exist. - mkdir -p ${NONCOG_RECLIENT_BIN_DIR} - else - # Clear out the non cog directory if it does exist. - rm -f ${NONCOG_RECLIENT_BIN_DIR}/* + if [[ "${OUT_DIR}" == "" ]]; then + OUT_DIR="out" fi + local RECLIENT_VERSION=`readlink prebuilts/remoteexecution-client/live` - local TOP=$(gettop) + local NONCOG_RECLIENT_BIN_DIR_BASE="${OUT_DIR}/.reclient" + local NONCOG_RECLIENT_BIN_DIR="${NONCOG_RECLIENT_BIN_DIR_BASE}/${RECLIENT_VERSION}" + if [ -d "${NONCOG_RECLIENT_BIN_DIR}" ]; then + if [ `ls ${NONCOG_RECLIENT_BIN_DIR} | wc -l` -gt 1 ] ; then + # binaries already exist, only update t Change-Id: Ia6cb7faae6366ee7491fcf91777318b772a3ba88
2023-09-28 19:46:59 +02:00
ln -sfn ${RECLIENT_VERSION} ${NONCOG_RECLIENT_BIN_DIR_BASE}/live
export RBE_DIR="${NONCOG_RECLIENT_BIN_DIR_BASE}/live"
}
# This function sets up the build environment to be appropriate for Cog.
function _setup_cog_env() {
_create_out_symlink_for_cog
if [ "$?" -eq "1" ]; then
echo -e "\e[0;33mWARNING:\e[00m Cog environment setup failed!"
return 1
fi
_copy_reclient_binaries_from_cog
export ANDROID_BUILD_ENVIRONMENT_CONFIG="googler-cog"
# Running repo command within Cog workspaces is not supported, so override
# it with this function. If the user is running repo within a Cog workspace,
# we'll fail with an error, otherwise, we run the original repo command with
# the given args.
ORIG_REPO_PATH=`which repo`
function repo {
if [[ "${PWD}" == /google/cog/* ]]; then
echo "\e[01;31mERROR:\e[0mrepo command is disallowed within Cog workspaces."
return 1
fi
${ORIG_REPO_PATH} "$@"
}
}
if [[ "${PWD}" != /google/cog/* ]]; then
echo -e "\e[01;31mERROR:\e[0m This script must be run from a Cog workspace."
fi
_setup_cog_env