summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2018-10-01 16:15:44 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-10-01 16:15:44 +0000
commit40a41f7bf2e671a92b6f3e0cfae08327c02d5d12 (patch)
tree1085816044eaa0258ad3910c32044f73b03d1e84
parent1f24b48b8210b6f97bd8bb5a832ae85536a7dd04 (diff)
parent77f5656a3c8138beb9f563964f452c46ab1f9a91 (diff)
downloadnative-pie-angle-preview-dev.tar.gz
Merge "Correct branch name: pie-angle-preview-dev" into pie-angle-preview-devpie-angle-preview-dev
-rw-r--r--opengl/ANGLE.md8
1 files changed, 5 insertions, 3 deletions
diff --git a/opengl/ANGLE.md b/opengl/ANGLE.md
index f353a90131..e5dc731e61 100644
--- a/opengl/ANGLE.md
+++ b/opengl/ANGLE.md
@@ -21,18 +21,20 @@ git checkout 95277a300f52bf89b7a8c14ada10e4dd3c5962b5
## AOSP
Google docs on downloading, building and installing AOSP [here](https://source.android.com/setup/build/building).
-Choose the “angle-preview” branch (which is based on “aosp-android-9.0.0_r8”), based on available vendor binaries posted [here](https://developers.google.com/android/drivers#marlinppr2.180905.006.a1). List of tagged branches [here](https://source.android.com/setup/start/build-numbers#source-code-tags-and-builds).
+Choose the “pie-angle-preview-dev” branch (which is based on “aosp-android-9.0.0_r8”),
+based on available vendor binaries posted [here](https://developers.google.com/android/drivers#marlinppr2.180905.006.a1).
+List of tagged branches [here](https://source.android.com/setup/start/build-numbers#source-code-tags-and-builds).
```bash
cd <location_for_aosp_build>
mkdir pie-angle-preview-dev
cd pie-angle-preview-dev
-repo init --depth=1 -u https://android.googlesource.com/platform/manifest -b angle-preview && repo sync -q -j$(nproc)
+repo init --depth=1 -u https://android.googlesource.com/platform/manifest -b pie-angle-preview-dev && repo sync -q -j$(nproc)
```
## Pixel Binaries
The example downloads bits to build AOSP on a Google Pixel XL.
-Download vendor and google binaries [here](https://developers.google.com/android/drivers#marlinppr2.180905.006.a1) into the top-level directory of your build (the angle-preview branch that you created above).
+Download vendor and google binaries [here](https://developers.google.com/android/drivers#marlinppr2.180905.006.a1) into the top-level directory of your build (the pie-angle-preview-dev branch that you created above).
These must match the version of source being built.
Untar and extract binaries:
```bash