diff options
| author | Conley Owens <cco3@android.com> | 2012-06-04 13:49:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-04 13:49:36 -0700 |
| commit | 26bd7f2c969ae4dec6494415baa97ebe0a9bbe40 (patch) | |
| tree | e8320bef4e32460fa91f41c546e1bc3b6409e251 | |
| parent | a86506e1c367e04e5ff47edc8307a7a3c0429400 (diff) | |
| parent | 8e39c18f3ba3ffeeb3217b545c9b14c5c9e977c9 (diff) | |
| download | source.android.com-26bd7f2c969ae4dec6494415baa97ebe0a9bbe40.tar.gz | |
am 8e39c18f: Merge "Handle multiarch libgl-mesa-dev on Ubuntu 12.04"
* commit '8e39c18f3ba3ffeeb3217b545c9b14c5c9e977c9':
Handle multiarch libgl-mesa-dev on Ubuntu 12.04
| -rw-r--r-- | src/source/initializing.md | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/source/initializing.md b/src/source/initializing.md index bbe33576..82dc8c03 100644 --- a/src/source/initializing.md +++ b/src/source/initializing.md @@ -113,9 +113,11 @@ guaranteed to work on branches other than master. $ sudo apt-get install git-core gnupg flex bison gperf build-essential \ zip curl libc6-dev libncurses5-dev:i386 x11proto-core-dev \ - libx11-dev:i386 libreadline6-dev:i386 libgl1-mesa-dev:i386 \ - g++-multilib mingw32 openjdk-6-jdk tofrodos python-markdown \ - libxml2-utils xsltproc zlib1g-dev:i386 libxext-dev:i386 + libx11-dev:i386 libreadline6-dev:i386 libgl1-mesa-glx:i386 \ + libgl1-mesa-dev g++-multilib mingw32 openjdk-6-jdk tofrodos \ + python-markdown libxml2-utils xsltproc zlib1g-dev:i386 \ + libxext-dev:i386 + $ sudo ln -s /usr/lib/i386-linux-gnu/mesa/libGL.so.1 /usr/lib/i386-linux-gnu/libGL.so ## Configuring USB Access ## |