From 9d3dedec894d5a13e0aa6a59f45b9dc0c52fd9f1 Mon Sep 17 00:00:00 2001 From: Christopher Robert Van Wiemeersch Date: Fri, 14 Dec 2018 14:06:41 -0800 Subject: [PATCH 1/3] add command for updating `third_party` compilation errors are thrown if the developer's checkout of the third-party repo (in their `third_party` directory) is not up to date. this command fixes that. --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index cd586684f..01e928463 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,11 @@ This repo is only available to Mozilla employees. If you have access to the rele - `third_party/svr/` for Snapdragon (should contain a `libs` folder, among other things) - `third_party/wavesdk/` for Vive (should contain a `build` folder, among other things) +The [repo in `third_party`](`https://github.com/MozillaReality/FirefoxReality-android-third-party`) can be updated like so: + +```bash +pushd third_party && git checkout master && git pull && popd +``` *Fetch Git submodules.* From 80b2dd420c7c511f12c63f7361f07e27e01928b0 Mon Sep 17 00:00:00 2001 From: Christopher Robert Van Wiemeersch Date: Fri, 14 Dec 2018 14:09:51 -0800 Subject: [PATCH 2/3] fix URL in README for `third_party` --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 01e928463..3a9175228 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ This repo is only available to Mozilla employees. If you have access to the rele - `third_party/svr/` for Snapdragon (should contain a `libs` folder, among other things) - `third_party/wavesdk/` for Vive (should contain a `build` folder, among other things) -The [repo in `third_party`](`https://github.com/MozillaReality/FirefoxReality-android-third-party`) can be updated like so: +The [repo in `third_party`](https://github.com/MozillaReality/FirefoxReality-android-third-party) can be updated like so: ```bash pushd third_party && git checkout master && git pull && popd From 6c5d28ea5a06f5d37812994a87c732aea8a86482 Mon Sep 17 00:00:00 2001 From: Christopher Robert Van Wiemeersch Date: Fri, 14 Dec 2018 15:06:38 -0800 Subject: [PATCH 3/3] tweak git command for `third_party` (per @bluemarvin's feedback) notice the `git checkout origin/master` in case `third_party` was checked out to a different branch/sha --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3a9175228..d158ae603 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ This repo is only available to Mozilla employees. If you have access to the rele The [repo in `third_party`](https://github.com/MozillaReality/FirefoxReality-android-third-party) can be updated like so: ```bash -pushd third_party && git checkout master && git pull && popd +pushd third_party && git fetch && git rebase origin/master && git checkout origin/master && popd ``` *Fetch Git submodules.*