Merge "Make 3.82 is ok for ICS and beyond"
diff --git a/scripts/micro-httpd.py b/scripts/micro-httpd.py
index 9292dab..1cffa08 100755
--- a/scripts/micro-httpd.py
+++ b/scripts/micro-httpd.py
@@ -18,10 +18,12 @@
import SocketServer
import os
+
+outdir = os.path.join(os.path.dirname(__file__), '..', 'out')
+os.chdir(outdir)
PORT = int(os.environ.get('HTTP_PORT', 8080))
Handler = SimpleHTTPServer.SimpleHTTPRequestHandler
httpd = SocketServer.TCPServer(('0.0.0.0', PORT), Handler)
httpd.allow_reuse_address = True
print 'Serving on port %d' % PORT
httpd.serve_forever()
-
diff --git a/src/source/initializing.md b/src/source/initializing.md
index 9848a7f..442aa03 100644
--- a/src/source/initializing.md
+++ b/src/source/initializing.md
@@ -72,10 +72,9 @@
## Installing required packages (Ubuntu 10.04 -- 11.10) ##
-Ubuntu 10.04 64-bit is recommended. Building using a newer version of Ubuntu or a 32-bit Ubuntu is
-currently only experimentally supported and is not guaranteed to work on branches other than master.
-
-64-bit (recommended)
+You will need a 64-bit version of Ubuntu. Ubuntu 10.04 is recommended.
+Building using a newer version of Ubuntu is currently only experimentally
+supported and is not guaranteed to work on branches other than master.
$ sudo apt-get install git-core gnupg flex bison gperf build-essential \
zip curl zlib1g-dev libc6-dev lib32ncurses5-dev ia32-libs \
@@ -91,13 +90,6 @@
$ sudo apt-get install libx11-dev:i386
-32-bit (experimental)
-
- $ sudo apt-get install git-core gnupg flex bison gperf build-essential \
- zip curl zlib1g-dev libc6-dev libncurses5-dev x11proto-core-dev \
- libx11-dev libreadline6-dev libgl1-mesa-dev tofrodos python-markdown \
- libxml2-utils xsltproc
-
## Installing required packages (Ubuntu 12.04) ##
Building on Ubuntu 12.04 is currently only experimentally supported and is not
diff --git a/src/source/known-issues.md b/src/source/known-issues.md
index a7dd9fa..a9df5c3 100644
--- a/src/source/known-issues.md
+++ b/src/source/known-issues.md
@@ -42,6 +42,17 @@
**Fix**: Use version R12 of the emulator, and a newer kernel that matches
those tools. No need to do a clean build.
- $ repo forall external/qemu -c git checkout aosp/tools_r12
+ $ repo forall platform/external/qemu -c git checkout aosp/tools_r12
$ make
$ emulator -kernel prebuilt/android-arm/kernel/kernel-qemu-armv7
+
+## Emulator built on MacOS 10.7 Lion doesn't work. ##
+
+**Symptom**: The emulator (any version) built on MacOS 10.7 Lion
+and/or on XCode 4.x doesn't start.
+
+**Cause**: Some change in the development environment causes
+the emulator to be compiled in a way that prevents it from working.
+
+**Fix**: Use an emulator binary from the SDK, which is built on
+MacOS 10.6 with XCode 3 and works on MacOS 10.7.