diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-12-04 14:58:00 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-12-04 14:58:00 -0800 |
| commit | 932ecc1a978640060c7147597bf1cb5af6ef80aa (patch) | |
| tree | 25431e86fe758a6a60991a5df40ff4da554f35d7 /scripts | |
| parent | e15ddaf4ae1de2e789197de3eb3f70ff40327a5b (diff) | |
| download | build_soong-932ecc1a978640060c7147597bf1cb5af6ef80aa.tar.gz build_soong-932ecc1a978640060c7147597bf1cb5af6ef80aa.tar.bz2 build_soong-932ecc1a978640060c7147597bf1cb5af6ef80aa.zip | |
Make setup_go_workspace_for_soong work on Mac
Test: build/soong/scripts/setup_go_workspace_for_soong.sh on Mac and Linux
Change-Id: Idfcad3ace6f3ff4b68a438b8f1e0d94ff35573e0
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/setup_go_workspace_for_soong.sh | 10 |
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() { |