aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/setup_go_workspace_for_soong.sh10
1 files changed, 9 insertions, 1 deletions
diff --git a/scripts/setup_go_workspace_for_soong.sh b/scripts/setup_go_workspace_for_soong.sh
index 1c9a0b7e..e2fb9fa3 100755
--- a/scripts/setup_go_workspace_for_soong.sh
+++ b/scripts/setup_go_workspace_for_soong.sh
@@ -53,6 +53,7 @@ function bindAll() {
bindOne "${ANDROID_PATH}/build/soong" "${OUTPUT_PATH}/src/android/soong"
bindOne "${ANDROID_PATH}/art/build" "${OUTPUT_PATH}/src/android/soong/art"
+ bindOne "${ANDROID_PATH}/external/golang-protobuf" "${OUTPUT_PATH}/src/github.com/golang/protobuf"
bindOne "${ANDROID_PATH}/external/llvm/soong" "${OUTPUT_PATH}/src/android/soong/llvm"
bindOne "${ANDROID_PATH}/external/clang/soong" "${OUTPUT_PATH}/src/android/soong/clang"
echo
@@ -64,7 +65,14 @@ function bindOne() {
existingPath="$1"
newPath="$2"
mkdir -p "$newPath"
- echoAndDo bindfs "${existingPath}" "${newPath}"
+ case $(uname -s) in
+ Darwin)
+ echoAndDo bindfs -o allow_recursion -n "${existingPath}" "${newPath}"
+ ;;
+ Linux)
+ echoAndDo bindfs "${existingPath}" "${newPath}"
+ ;;
+ esac
}
function echoAndDo() {