aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConley Owens <cco3@android.com>2011-05-04 15:15:46 -0700
committerConley Owens <cco3@android.com>2011-05-04 15:19:56 -0700
commit1f494d2a7a1d7b87378e450fe918eff2bc01d604 (patch)
tree07d6e703b23c82182691100dd01c3984dcac3e7f
parentfe577ef9985a2862ed431db95cba87cecd67c57e (diff)
downloadsource.android.com-1f494d2a7a1d7b87378e450fe918eff2bc01d604.tar.gz
Fixed problem with Ubuntu packages only being correct for 64-bit systems.
(I also snuck in a little helpful output into microhttpd) Change-Id: Ic67d311a3c7bc93d7338edd9b8c3f6870731c0c0
-rwxr-xr-xscripts/micro-httpd.py1
-rw-r--r--src/source/initializing.md11
2 files changed, 10 insertions, 2 deletions
diff --git a/scripts/micro-httpd.py b/scripts/micro-httpd.py
index cf0b4027..13e35a7b 100755
--- a/scripts/micro-httpd.py
+++ b/scripts/micro-httpd.py
@@ -18,4 +18,5 @@ import SimpleHTTPServer, SocketServer, os
PORT = int(os.environ.get('HTTP_PORT', 8080))
Handler = SimpleHTTPServer.SimpleHTTPRequestHandler
httpd = SocketServer.TCPServer(("0.0.0.0", PORT), Handler)
+print "Serving on port %d" % PORT
httpd.serve_forever()
diff --git a/src/source/initializing.md b/src/source/initializing.md
index 31f03a9d..6626482f 100644
--- a/src/source/initializing.md
+++ b/src/source/initializing.md
@@ -64,11 +64,18 @@ Java 5: for Froyo and older
## Installing required packages ##
-To set up your development environment, install the following required packages:
+To set up your development environment, install the following required packages.
- $ sudo apt-get install git-core gnupg flex bison gperf build-essential zip curl zlib1g-dev libc6-dev
+64-bit systems:
+
+ $ sudo apt-get install git-core gnupg flex bison gperf build-essential zip curl zlib1g-dev libc6-dev
lib32ncurses5-dev ia32-libs x11proto-core-dev libx11-dev lib32readline5-dev lib32z-dev libgl1-mesa-dev
+32-bit systems:
+
+ $ 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 libreadline5-dev libz-dev libgl1-mesa-dev
+
For building Froyo or an older release on a 64-bit system, several other packages are necessary to establish a 32-bit build environment:
$ sudo apt-get install gcc-multilib g++-multilib libc6-i386 libc6-dev-i386