OSDN Git Service
Doug Zongker [Wed, 27 May 2009 22:06:53 +0000 (15:06 -0700)]
am
8b70e8c6: use minigzip instead of system gzip in the build
Merge commit '
8b70e8c6574e6e6e80aaa84fe1a9426995fa0a78'
* commit '
8b70e8c6574e6e6e80aaa84fe1a9426995fa0a78':
use minigzip instead of system gzip in the build
Doug Zongker [Wed, 27 May 2009 16:14:25 +0000 (09:14 -0700)]
use minigzip instead of system gzip in the build
Use zlib's minigzip utility, built as part of our source tree, instead of
whatever installation of GNU gzip happens to be on the user's machine.
Using zlib's deflater, which is nicely available as a library (unlike
GNU gzip's deflater) will ultimately let us do binary patches to the
boot and recovery images.
Dirk Dougherty [Tue, 26 May 2009 17:11:40 +0000 (10:11 -0700)]
am
5d1b9731: am
29eafdea: AI 149251: Add 1.x Icon Guidelines doc and template pack. BUG=
1790234
Merge commit '
5d1b97315763b8a8882b428885342e0cd2817050'
* commit '
5d1b97315763b8a8882b428885342e0cd2817050':
AI 149251: Add 1.x Icon Guidelines doc and template pack.
Dirk Dougherty [Tue, 26 May 2009 17:02:55 +0000 (10:02 -0700)]
am
29eafdea: AI 149251: Add 1.x Icon Guidelines doc and template pack. BUG=
1790234
Merge commit '
29eafdea34a5239b25fe82e5cd6debf1a5157c6b' into donut
* commit '
29eafdea34a5239b25fe82e5cd6debf1a5157c6b':
AI 149251: Add 1.x Icon Guidelines doc and template pack.
Dirk Dougherty [Tue, 26 May 2009 15:40:40 +0000 (08:40 -0700)]
AI 149251: Add 1.x Icon Guidelines doc and template pack.
BUG=
1790234
Automated import of CL 149251
The Android Open Source Project [Mon, 25 May 2009 15:48:37 +0000 (08:48 -0700)]
merged
866a6d399e0ec2a0604c3d64e372f827a87ec843 with conflicts in core/binary.mk
Android (Google) Code Review [Mon, 25 May 2009 09:53:19 +0000 (02:53 -0700)]
Merge change 1642 into donut
* changes:
Allow the build system to build Objective-C sources.
Android (Google) Code Review [Fri, 22 May 2009 23:55:41 +0000 (16:55 -0700)]
am
3026e96d: Merge change 2245 into donut
Merge commit '
3026e96dcea7893d762d3ad1532c3775dfe01b60'
* commit '
3026e96dcea7893d762d3ad1532c3775dfe01b60':
Define TARGET_CPU_ABI for finding native code in .apks
Android (Google) Code Review [Fri, 22 May 2009 23:53:05 +0000 (16:53 -0700)]
Merge change 2245 into donut
* changes:
Define TARGET_CPU_ABI for finding native code in .apks
Android (Google) Code Review [Fri, 22 May 2009 23:01:23 +0000 (16:01 -0700)]
am
6941562e: Merge change 2288 into donut
Merge commit '
6941562ed3b2ca8fe315ce95bf15a0e57efb4a81'
* commit '
6941562ed3b2ca8fe315ce95bf15a0e57efb4a81':
Adding in the path the new android.tts package.
Android (Google) Code Review [Fri, 22 May 2009 22:59:15 +0000 (15:59 -0700)]
Merge change 2288 into donut
* changes:
Adding in the path the new android.tts package.
Doug Zongker [Fri, 22 May 2009 22:35:02 +0000 (15:35 -0700)]
am
8ce7c25e: improve password entry for signing keys
Merge commit '
8ce7c25e905bc14382359e1cd45d41832bcc7ffa'
* commit '
8ce7c25e905bc14382359e1cd45d41832bcc7ffa':
improve password entry for signing keys
Modified the image and index URLs to point to guide/index.html now
Doug Zongker [Fri, 22 May 2009 20:34:54 +0000 (13:34 -0700)]
improve password entry for signing keys
Allow the user to set ANDROID_PW_FILE to the name of a file for
storing password keys. When the tools need additional passwords, they
will rewrite this file and invoke the user's editor for the new
passwords to be added. This allows passwords to be reused across
invocations of the signing tools, without making the user reenter them
every time.
Paranoid users can use a file stored in a ramdisk, or not use this
feature at all (the code will prompt for passwords in the ordinary way
when ANDROID_PW_FILE is not set).
Dianne Hackborn [Thu, 21 May 2009 22:45:30 +0000 (15:45 -0700)]
Define TARGET_CPU_ABI for finding native code in .apks
Android (Google) Code Review [Fri, 22 May 2009 19:41:18 +0000 (12:41 -0700)]
Merge change 2340
* changes:
Add libacc to the prelink map.
Jack Palevich [Fri, 22 May 2009 19:11:44 +0000 (12:11 -0700)]
Add libacc to the prelink map.
Libacc is a tiny subset of C intended for use as a scripting language for
a 3D UI.
Gaurav Mathur [Thu, 21 May 2009 20:35:47 +0000 (13:35 -0700)]
Modified the image and index URLs to point to guide/index.html now
Robert Greenwalt [Wed, 20 May 2009 20:37:35 +0000 (13:37 -0700)]
Add PRODUCT_DEFAULT_WIFI_CHANNELS build var.
Allows the build to specify the default number of allowed
WIFI channels. Part of the fix for
1625953.
Jean-Michel Trivi [Fri, 22 May 2009 01:44:30 +0000 (18:44 -0700)]
Adding in the path the new android.tts package.
Gaurav Mathur [Thu, 21 May 2009 20:35:47 +0000 (13:35 -0700)]
Modified the image and index URLs to point to guide/index.html now
Android (Google) Code Review [Thu, 21 May 2009 16:42:43 +0000 (09:42 -0700)]
am
1028c4f0: Merge change 2184 into donut
Merge commit '
1028c4f04051f95fbb4fd9120e7ab1cf43462bd5'
* commit '
1028c4f04051f95fbb4fd9120e7ab1cf43462bd5':
cleanspec.mk: Clean anroid.location intermediates to deal with ILocationCollector removal.
Mike Lockwood [Thu, 21 May 2009 16:42:35 +0000 (09:42 -0700)]
am
051672bc: Update the error message that occurs when current.xml needs regenerating.
Merge commit '
051672bc6c41a5a24ed4057f9d78f5e9caaf7aef'
* commit '
051672bc6c41a5a24ed4057f9d78f5e9caaf7aef':
Update the error message that occurs when current.xml needs regenerating.
Android (Google) Code Review [Thu, 21 May 2009 15:52:44 +0000 (08:52 -0700)]
Merge change 2184 into donut
* changes:
cleanspec.mk: Clean anroid.location intermediates to deal with ILocationCollector removal.
Mike Lockwood [Thu, 21 May 2009 15:35:36 +0000 (11:35 -0400)]
cleanspec.mk: Clean anroid.location intermediates to deal with ILocationCollector removal.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Thu, 21 May 2009 13:26:12 +0000 (09:26 -0400)]
Update the error message that occurs when current.xml needs regenerating.
We are no longer using p4 for source control and there are no longer OWNERS files.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Doug Zongker [Thu, 21 May 2009 05:44:04 +0000 (22:44 -0700)]
am
eb338efd: make sure package keys are consistent with shared users
Merge commit '
eb338efd2eae20962c7ca75baf161be540b3d664'
* commit '
eb338efd2eae20962c7ca75baf161be540b3d664':
make sure package keys are consistent with shared users
Doug Zongker [Wed, 20 May 2009 23:50:49 +0000 (16:50 -0700)]
make sure package keys are consistent with shared users
All APKs that want to share a given user id must be signed with the
same key. Look inside each APK for what (if any) shared user id it
requests, and error out if any with the same shared user are being
signed with different keys.
Android (Google) Code Review [Wed, 20 May 2009 19:40:21 +0000 (12:40 -0700)]
Merge change 2060
* changes:
add an entry for libbinder in the prelink map
Android (Google) Code Review [Wed, 20 May 2009 18:49:42 +0000 (11:49 -0700)]
am
87fc0fdc: Merge change 1738 into donut
Merge commit '
87fc0fdc53b5998a36e0a305518525c28db7f35f'
* commit '
87fc0fdc53b5998a36e0a305518525c28db7f35f':
add -e option to add extra commands to OTA script
Android (Google) Code Review [Wed, 20 May 2009 17:01:00 +0000 (10:01 -0700)]
Merge change 1738 into donut
* changes:
add -e option to add extra commands to OTA script
David 'Digit' Turner [Thu, 14 May 2009 14:00:09 +0000 (16:00 +0200)]
Allow the build system to build Objective-C sources.
This is needed to move our modified SDL sources under external/qemu/distrib.
As per joeo's request, this change also enables target Objective-C compilation, letting it error at build time.
Mathias Agopian [Mon, 18 May 2009 22:57:42 +0000 (15:57 -0700)]
add an entry for libbinder in the prelink map
Patrick Scott [Tue, 19 May 2009 22:13:58 +0000 (18:13 -0400)]
Change PRIVATE to LOCAL for additional dependencies.
This change will be used by webcore_test in a separate change.
Android (Google) Code Review [Tue, 19 May 2009 06:55:41 +0000 (23:55 -0700)]
am
2223e3c2: Merge change 1797 into donut
Merge commit '
2223e3c2706a0c77b12a4526c78ce1611a641605'
* commit '
2223e3c2706a0c77b12a4526c78ce1611a641605':
Remove tcpdump from the old location (it's now in system/xbin)
Android (Google) Code Review [Tue, 19 May 2009 00:31:07 +0000 (17:31 -0700)]
Merge change 1797 into donut
* changes:
Remove tcpdump from the old location (it's now in system/xbin)
The Android Open Source Project [Mon, 18 May 2009 20:47:57 +0000 (13:47 -0700)]
Dianne Hackborn [Sat, 16 May 2009 01:01:20 +0000 (18:01 -0700)]
Use new aapt feature to add default version info to .apks.
Ed Heyl [Fri, 15 May 2009 22:02:03 +0000 (15:02 -0700)]
Dan Egnor [Fri, 15 May 2009 20:05:52 +0000 (13:05 -0700)]
Remove tcpdump from the old location (it's now in system/xbin)
Joe Onorato [Fri, 15 May 2009 15:11:38 +0000 (08:11 -0700)]
am
eefd0212: Print the platform version and version codename in the big build header.
Merge commit '
eefd0212f10ec83b21d1792130b4cad02d2ce4d5'
* commit '
eefd0212f10ec83b21d1792130b4cad02d2ce4d5':
Print the platform version and version codename in the big build header.
Joe Onorato [Wed, 13 May 2009 04:45:23 +0000 (00:45 -0400)]
Print the platform version and version codename in the big build header.
Doug Zongker [Fri, 15 May 2009 02:06:36 +0000 (19:06 -0700)]
add -e option to add extra commands to OTA script
Gaurav Mathur [Thu, 14 May 2009 23:30:43 +0000 (16:30 -0700)]
am
cb08f15b: am
ee6df9b4: AI 148870: Pinging Ryan for Dr No approval. --- Cloned from CL 147240 by \'g4 patch\'. Original change by dwarren@dwarren-pdk on 2009/04/21 14:59:50. "Making PDK work in SDK environment." This CL should be pretty straight forward and should be touching only PDK related templates, etc. Turns out we no longer need to touch the highlightNav code.
Merge commit '
cb08f15bf48f070c0bc2925846cd7ef7b1dc4c55'
* commit '
cb08f15bf48f070c0bc2925846cd7ef7b1dc4c55':
AI 148870: Pinging Ryan for Dr No approval.
Gaurav Mathur [Thu, 14 May 2009 23:18:20 +0000 (16:18 -0700)]
am
ee6df9b4: AI 148870: Pinging Ryan for Dr No approval. --- Cloned from CL 147240 by \'g4 patch\'. Original change by dwarren@dwarren-pdk on 2009/04/21 14:59:50. "Making PDK work in SDK environment." This CL should be pretty straight forward and should be touching only PDK related templates, etc. Turns out we no longer need to touch the highlightNav code.
Merge commit '
ee6df9b4fe6e1a7431ff77d81fb8c164ee99f31d' into donut
* commit '
ee6df9b4fe6e1a7431ff77d81fb8c164ee99f31d':
AI 148870: Pinging Ryan for Dr No approval.
Gaurav Mathur [Thu, 14 May 2009 23:02:22 +0000 (16:02 -0700)]
AI 148870: Pinging Ryan for Dr No approval.
---
Cloned from CL 147240 by 'g4 patch'.
Original change by dwarren@dwarren-pdk on 2009/04/21 14:59:50.
"Making PDK work in SDK environment."
This CL should be pretty straight forward and should be touching only PDK
related templates, etc. Turns out we no longer need to touch the highlightNav
code.
Automated import of CL 148870
The Android Open Source Project [Thu, 14 May 2009 21:52:21 +0000 (14:52 -0700)]
Doug Kwan [Thu, 14 May 2009 09:17:32 +0000 (02:17 -0700)]
Rollback to gcc-4.2.1
Scott Main [Thu, 14 May 2009 00:55:09 +0000 (17:55 -0700)]
am
cdc13d7: am
9b54792: AI 148820: adjust the "nolist" class to add bott
Merge commit '
cdc13d717b016c61592e34dacabf24c09c3bca4c'
* commit '
cdc13d717b016c61592e34dacabf24c09c3bca4c':
AI 148820: adjust the "nolist" class to add bottom-spacing and refine list item padding;
Scott Main [Thu, 14 May 2009 00:52:28 +0000 (17:52 -0700)]
am
9b54792: AI 148820: adjust the "nolist" class to add bottom-spacing a
Merge commit '
9b54792d7044125126a9765d1baf3ff0e59efcb4' into donut
* commit '
9b54792d7044125126a9765d1baf3ff0e59efcb4':
AI 148820: adjust the "nolist" class to add bottom-spacing and refine list item padding;
Scott Main [Thu, 14 May 2009 00:50:33 +0000 (17:50 -0700)]
AI 148820: adjust the "nolist" class to add bottom-spacing and refine list item padding;
add vertical padding to quickview list items so that items are distinguishable when the text wraps-around the line
BUG=
1790235
Automated import of CL 148820
Android (Google) Code Review [Wed, 13 May 2009 21:15:30 +0000 (14:15 -0700)]
am
3de1fe6: Merge change 1529 into donut
Merge commit '
3de1fe627073608270f844714f24ed83ed4266db'
* commit '
3de1fe627073608270f844714f24ed83ed4266db':
Fix makefile to be compatible with findbugs v 1.3.8
Android (Google) Code Review [Wed, 13 May 2009 21:06:28 +0000 (14:06 -0700)]
Merge change 1529 into donut
* changes:
Fix makefile to be compatible with findbugs v 1.3.8 modified: core/java.mk
Android (Google) Code Review [Wed, 13 May 2009 20:52:48 +0000 (13:52 -0700)]
Merge change 1564
* changes:
Update build version to Eclair.
Dianne Hackborn [Wed, 13 May 2009 19:59:25 +0000 (12:59 -0700)]
Update build version to Eclair.
Andrew Stadler [Wed, 13 May 2009 07:44:59 +0000 (00:44 -0700)]
Fix makefile to be compatible with findbugs v 1.3.8
modified: core/java.mk
Wei Huang [Fri, 8 May 2009 00:13:22 +0000 (17:13 -0700)]
new data messaging api: build com.google.android.datamessaging.jar
Dirk Dougherty [Wed, 13 May 2009 02:03:27 +0000 (19:03 -0700)]
am
e9a96dd: am
4e4c919: AI 148759: Add download page for NDK 1.5 r1.
Merge commit '
e9a96dd92c2577b77d3a5e5a0d04dfab6f4af5f2'
* commit '
e9a96dd92c2577b77d3a5e5a0d04dfab6f4af5f2':
AI 148759: Add download page for NDK 1.5 r1.
Dirk Dougherty [Wed, 13 May 2009 01:49:27 +0000 (18:49 -0700)]
am
4e4c919: AI 148759: Add download page for NDK 1.5 r1.
Merge commit '
4e4c919539c5fb2f790143dde9c318501457ce43' into donut
* commit '
4e4c919539c5fb2f790143dde9c318501457ce43':
AI 148759: Add download page for NDK 1.5 r1.
Dirk Dougherty [Tue, 12 May 2009 22:32:35 +0000 (15:32 -0700)]
AI 148759: Add download page for NDK 1.5 r1.
BUG=
1790234
Automated import of CL 148759
Phil Dubach [Mon, 11 May 2009 18:09:33 +0000 (11:09 -0700)]
am
233728d: am
9e35a86: AI 148675: CTS: Copy only the \'startcts\' scrip
Merge commit '
233728de06f3ce711c0be94d5a3427bc007674a3'
* commit '
233728de06f3ce711c0be94d5a3427bc007674a3':
AI 148675: CTS: Copy only the 'startcts' script into the cts distribution
Phil Dubach [Mon, 11 May 2009 18:03:44 +0000 (11:03 -0700)]
am
9e35a86: AI 148675: CTS: Copy only the \'startcts\' script into the cts
Merge commit '
9e35a86b833c8bd520c9f889be3f2859a5ed7b45' into donut
* commit '
9e35a86b833c8bd520c9f889be3f2859a5ed7b45':
AI 148675: CTS: Copy only the 'startcts' script into the cts distribution
Phil Dubach [Mon, 11 May 2009 18:00:16 +0000 (11:00 -0700)]
AI 148675: CTS: Copy only the 'startcts' script into the cts distribution
Before CL 148645, 'startcts' called the 'cts' script. This is no longer the
case, so we want to exclude the 'cts' script from the distribution to avoid
confusion. The 'cts' script is only used when running cts directly on a
fully built source tree.
Automated import of CL 148675
Android (Google) Code Review [Sat, 9 May 2009 05:48:56 +0000 (22:48 -0700)]
am
e27db38: Merge change 1291 into donut
Merge commit '
e27db38fdd6b29ae470a7d296a4de07002f23acb'
* commit '
e27db38fdd6b29ae470a7d296a4de07002f23acb':
allow separate source and target files for applypatch
Android (Google) Code Review [Fri, 8 May 2009 23:03:49 +0000 (16:03 -0700)]
Merge change 1291 into donut
* changes:
allow separate source and target files for applypatch
Doug Zongker [Fri, 8 May 2009 20:46:25 +0000 (13:46 -0700)]
allow separate source and target files for applypatch
Allow applypatch to use different filenames for the source and target.
(Using the same filename is still fine; in fact the target filename
can be specified as "-" to mean "same as the source file.) This will
allow us to still use diffs in the case of files being renamed, and
will allow us to use diffs for the boot and recovery images.
Dianne Hackborn [Fri, 8 May 2009 20:52:08 +0000 (13:52 -0700)]
am
9537884: Add new property for dev codename, update version to Donut.
Merge commit '
9537884b0dabe81bf612c79d12c7b4bf40de10a5'
* commit '
9537884b0dabe81bf612c79d12c7b4bf40de10a5':
Add new property for dev codename, update version to Donut.
Dianne Hackborn [Fri, 8 May 2009 19:06:17 +0000 (12:06 -0700)]
Add new property for dev codename, update version to Donut.
Dima Zavin [Fri, 8 May 2009 18:19:04 +0000 (11:19 -0700)]
am
6ea3b88: core: Recovery image should have the custom kernel base as w
Merge commit '
6ea3b8856d656752c0310ca237ed99e7451be83b'
* commit '
6ea3b8856d656752c0310ca237ed99e7451be83b':
core: Recovery image should have the custom kernel base as well.
Dima Zavin [Fri, 8 May 2009 04:10:41 +0000 (21:10 -0700)]
core: Recovery image should have the custom kernel base as well.
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Fri, 8 May 2009 02:59:48 +0000 (19:59 -0700)]
am
1e0847c: core: Allow the board config to specify the kernel base addr
Merge commit '
1e0847c2fcbe1b95464f32a719d2b9e620d1e6ec'
* commit '
1e0847c2fcbe1b95464f32a719d2b9e620d1e6ec':
core: Allow the board config to specify the kernel base address for mkbootimg
Dima Zavin [Fri, 8 May 2009 02:43:08 +0000 (19:43 -0700)]
core: Allow the board config to specify the kernel base address for mkbootimg
Signed-off-by: Dima Zavin <dima@android.com>
Jorg Pleumann [Thu, 7 May 2009 08:41:12 +0000 (01:41 -0700)]
am
1f61dc3: am
6178820: AI 148430: Adding a new CTS test runner that is
Merge commit '
1f61dc3e19f1a18dabbc11ce6cf4a62851933ad0'
* commit '
1f61dc3e19f1a18dabbc11ce6cf4a62851933ad0':
AI 148430: Adding a new CTS test runner that is basically
Jorg Pleumann [Thu, 7 May 2009 08:36:23 +0000 (01:36 -0700)]
am
6178820: AI 148430: Adding a new CTS test runner that is basically
Merge commit '
6178820340ccca2656fab0953bbe77da2e3e4bb7' into donut
* commit '
6178820340ccca2656fab0953bbe77da2e3e4bb7':
AI 148430: Adding a new CTS test runner that is basically
Jorg Pleumann [Thu, 7 May 2009 08:33:14 +0000 (01:33 -0700)]
AI 148430: Adding a new CTS test runner that is basically
a copy of the old one, but resides in android/cts
and is built and installed as part of the CTS.
This makes sure we always have the correct test
runner on a device, so we should see the various
improvements also on off-the-shelf Cupcake phones.
BUG=
1537738
Automated import of CL 148430
San Mehat [Wed, 6 May 2009 23:43:54 +0000 (16:43 -0700)]
am
6ffb159: prelink: Add libsysutils to prelink map
Merge commit '
6ffb159a8be65e2a63f17cc35f57e79e3e26809b'
* commit '
6ffb159a8be65e2a63f17cc35f57e79e3e26809b':
prelink: Add libsysutils to prelink map
Android (Google) Code Review [Wed, 6 May 2009 23:43:54 +0000 (16:43 -0700)]
am
a3896fb: Merge change 1001 into donut
Merge commit '
a3896fbc15d32881d87e1ae8b7c6e2e7523008c7'
* commit '
a3896fbc15d32881d87e1ae8b7c6e2e7523008c7':
Change runtest env shortcut to point to runtest.py
San Mehat [Wed, 6 May 2009 18:22:05 +0000 (11:22 -0700)]
prelink: Add libsysutils to prelink map
Signed-off-by: San Mehat <san@google.com>
Dirk Dougherty [Wed, 6 May 2009 17:53:03 +0000 (10:53 -0700)]
resolved conflict w/
cfb0820 merge....
Android (Google) Code Review [Wed, 6 May 2009 17:30:41 +0000 (10:30 -0700)]
Merge change 1001 into donut
* changes:
Change runtest env shortcut to point to runtest.py
Dirk Dougherty [Wed, 6 May 2009 00:42:41 +0000 (17:42 -0700)]
am
40a06d8: AI 148314: Remove droiddoc code that applies the deprecated
Merge commit '
40a06d89406a3e928a5e0d41a3077f59d8f5345d' into donut
* commit '
40a06d89406a3e928a5e0d41a3077f59d8f5345d':
AI 148314: Remove droiddoc code that applies the deprecated state of superclasses to subclasses. This change was originally made in Gerrit 7655. https://review.source.android.com/Gerrit#change,7655
Dave Bort [Wed, 6 May 2009 00:04:20 +0000 (17:04 -0700)]
Merge commit '
9528248' into master
Conflicts:
core/combo/linux-arm.mk
Signed-off-by: Dave Bort <dbort@android.com>
Brett Chabot [Tue, 5 May 2009 19:47:09 +0000 (12:47 -0700)]
Change runtest env shortcut to point to runtest.py
Dirk Dougherty [Tue, 5 May 2009 20:41:56 +0000 (13:41 -0700)]
AI 148314: Remove droiddoc code that applies the deprecated state of superclasses to subclasses. This change was originally made in Gerrit 7655. https://review.source.android.com/Gerrit#change,7655
BUG=
1827730
Automated import of CL 148314
Dave Bort [Fri, 24 Apr 2009 01:44:55 +0000 (18:44 -0700)]
core: Don't debug native modules when TARGET_BUILD_TYPE==debug
Don't make the simulator default to debug mode.
Remove all global "debug" {C,CPP}FLAGS, which are no longer used.
Android (Google) Code Review [Mon, 4 May 2009 22:41:01 +0000 (15:41 -0700)]
Merge change 954
* changes:
Extend build system to compile generated "C" files.
Jack Palevich [Mon, 4 May 2009 21:32:44 +0000 (14:32 -0700)]
Extend build system to compile generated "C" files.
Until now only generated assembly or C++ files would be compiled. This patch extends the build
system to compile generated C files as well. The new rule is modeled on the existing rules for
compiling generated C++ files and the existing rule for compiling ordinary C files.
Android (Google) Code Review [Mon, 4 May 2009 20:33:01 +0000 (13:33 -0700)]
am
6062815: Merge change 859 into donut
Merge commit '
6062815e2e5db38ad90d580782bd733e23d027f2'
* commit '
6062815e2e5db38ad90d580782bd733e23d027f2':
Change 77 from git master branch:
James Dong [Mon, 4 May 2009 18:16:30 +0000 (11:16 -0700)]
Android (Google) Code Review [Fri, 1 May 2009 21:08:59 +0000 (14:08 -0700)]
Merge change 859 into donut
* changes:
Change 77 from git master branch: change the prelink-linux-arm.map to include OC 2.0 new shared libs - remove redundant share lib from the map - remove 2way share lib from the map
Dirk Dougherty [Fri, 1 May 2009 18:58:55 +0000 (11:58 -0700)]
am
a19801e: am
c521e26: AI 148186: Add support for using custom pdk temp
Merge commit '
a19801e0600b9016149f56cff05da5a699bf09cc'
* commit '
a19801e0600b9016149f56cff05da5a699bf09cc':
AI 148186: Add support for using custom pdk templates. The make rule for pdk docs should set LOCAL_DROIDDOC_OPTIONS += -hdf android.whichdoc online-pdk
James Dong [Fri, 1 May 2009 04:28:04 +0000 (21:28 -0700)]
Change 77 from git master branch:
change the prelink-linux-arm.map to include OC 2.0 new shared libs
- remove redundant share lib from the map
- remove 2way share lib from the map
Dirk Dougherty [Fri, 1 May 2009 18:20:14 +0000 (11:20 -0700)]
am
c521e26: AI 148186: Add support for using custom pdk templates. The m
Merge commit '
c521e266406d0393313e17ba29ae519315a5cf6e' into donut
* commit '
c521e266406d0393313e17ba29ae519315a5cf6e':
AI 148186: Add support for using custom pdk templates. The make rule for pdk docs should set LOCAL_DROIDDOC_OPTIONS += -hdf android.whichdoc online-pdk
Dirk Dougherty [Fri, 1 May 2009 18:19:55 +0000 (11:19 -0700)]
AI 148186: Add support for using custom pdk templates. The make rule for pdk docs should set LOCAL_DROIDDOC_OPTIONS += -hdf android.whichdoc online-pdk
BUG=
1646802
Automated import of CL 148186
Doug Kwan [Fri, 1 May 2009 01:11:11 +0000 (18:11 -0700)]
am
8c9bef6: switch compiler to gcc-4.3.1
Merge commit '
8c9bef616666ee8c6d5cc9243f3d89c44d15d216'
* commit '
8c9bef616666ee8c6d5cc9243f3d89c44d15d216':
switch compiler to gcc-4.3.1
Joe Onorato [Thu, 30 Apr 2009 23:52:20 +0000 (16:52 -0700)]
am
7b2845a: Don\'t rebuild the NOTICE files when building with mm, mmm, e
Merge commit '
7b2845ab1a47324a6fb25261048510e79656a732'
* commit '
7b2845ab1a47324a6fb25261048510e79656a732':
Don't rebuild the NOTICE files when building with mm, mmm, etc.
Doug Kwan [Thu, 30 Apr 2009 21:47:05 +0000 (14:47 -0700)]
switch compiler to gcc-4.3.1
Switch default ARM compiler to gcc-4.3.1 for Neon support.
Joe Onorato [Thu, 30 Apr 2009 20:52:50 +0000 (13:52 -0700)]
Don't rebuild the NOTICE files when building with mm, mmm, etc.
Joe Onorato [Thu, 30 Apr 2009 04:20:21 +0000 (21:20 -0700)]
am
8849aed: Slim down chooseproduct (used by choosecombo).
Merge commit '
8849aedde07373948b45a55703e7764de0a7199d'
* commit '
8849aedde07373948b45a55703e7764de0a7199d':
Slim down chooseproduct (used by choosecombo).
Joe Onorato [Wed, 29 Apr 2009 22:56:47 +0000 (15:56 -0700)]
Slim down chooseproduct (used by choosecombo).
People keep getting confused by the default products
in this list, which are almost never what they want,
because this list roughly corresponds to the DEVICES
and not the PRODUCTS.
Now that lunch works again, I'm not too worried about
choosecombo except for the couple of cases lunch can't
handle, like the simulator. Therefore, this change
just removes the list of suggested products, and you
have to know which one you're trying to build (which
seems like a resonable prerequisite).
Dirk Dougherty [Wed, 29 Apr 2009 18:02:43 +0000 (11:02 -0700)]
am
b4abfb9: am
12741f5: AI 147874: Fix format and link errors in docs.
Merge commit '
b4abfb91bf1519af1e2826cc2246f324c06a983c'
* commit '
b4abfb91bf1519af1e2826cc2246f324c06a983c':
AI 147874: Fix format and link errors in docs.