OSDN Git Service
Colin Cross [Tue, 9 Mar 2010 03:07:40 +0000 (19:07 -0800)]
Use ARCH_ARM_HAVE_ARMV7A to select qemu kernel for dexpreopt
Change-Id: I440d944e87324038e465415b1b71613b31052f99
Colin Cross [Tue, 9 Mar 2010 02:32:43 +0000 (18:32 -0800)]
Add a new build target armv7-a-neon
Change-Id: Ib3b44e839b093974aff0d595950e6b691beee7a5
Colin Cross [Tue, 9 Mar 2010 03:07:26 +0000 (19:07 -0800)]
Modify the armv7-a target arch to not use NEON
To build for a target with NEON, use armv7-a-neon
Change-Id: I70d509287b04c0faebe44faf6c8ebb28a7360ff9
The Android Open Source Project [Tue, 9 Mar 2010 01:16:23 +0000 (17:16 -0800)]
merge from open-source master
Change-Id: I9fedeb014c946b53bfdd424b00c0cb5fc08f8333
Andy McFadden [Mon, 8 Mar 2010 20:42:46 +0000 (12:42 -0800)]
Added -lpthread to target LDFLAGS for sim-eng.
This adds "-lpthread" to TARGET_GLOBAL_LDFLAGS when TARGET_SIMULATOR
is true. This is much easier than inserting it into individual
makefiles as needed. Has no effect on other builds.
Should fix the sim-eng build breakage in libcameraservice.
Change-Id: I4dcd7d54b93d1be1622b8ce78a1662d28ca9f9f2
Dan Egnor [Fri, 5 Mar 2010 23:31:49 +0000 (15:31 -0800)]
Cleanspec rules to take care of old (pre-static) libraries.
(The build system doesn't react gracefully when something is switched
from a shared library to a static library.)
Andrew Stadler [Fri, 5 Mar 2010 20:45:52 +0000 (12:45 -0800)]
Fix builds due to Music2 moving around.
Jean-Baptiste Queru [Fri, 5 Mar 2010 15:23:14 +0000 (07:23 -0800)]
Merge from eclair
Change-Id: I4496dadd8a738a05c647589ca78732e9b608ca29
Jean-Baptiste Queru [Fri, 5 Mar 2010 01:31:28 +0000 (17:31 -0800)]
Add provisioning app in the generic build
Change-Id: Iffdd4d21a3c55e7a73d58289fda31ac8a27a18ac
Jean-Baptiste Queru [Fri, 22 Jan 2010 21:25:24 +0000 (13:25 -0800)]
Look for product configs in device/ in addition to vendor/
This will allow to create open-sourceable product configurations.
Change-Id: I4e73347c2095935340bfc8c3737c2adf1ef22a9c
Romain Guy [Thu, 4 Mar 2010 20:01:58 +0000 (12:01 -0800)]
Add clean step for Launcher & Launcher2
Dan Egnor [Thu, 4 Mar 2010 03:27:40 +0000 (19:27 -0800)]
Remove a bunch of obsolete/(potentially) renamed .apk's.
I found these kicking around my system/app with old timestamps, and old
packages just cause trouble. Depending on the build flavor they may or
may not still be there, but it's harmless to clean them.
Ying Wang [Wed, 3 Mar 2010 22:32:06 +0000 (14:32 -0800)]
Fix proguard_option_file.
Ying Wang [Wed, 3 Mar 2010 18:45:14 +0000 (10:45 -0800)]
Decentralizes cleanspecs.
After this change, you should add-clean-step at the end of CleanSpec.mk
in your project, instead of the centralized cleanspecs.mk in build/core.
Daniel Sandler [Tue, 2 Mar 2010 19:09:55 +0000 (14:09 -0500)]
Switch to Launcher2 for all builds.
Change-Id: I0a0af777bc290224c72511abfbc8ed60f8ef2174
Marco Nelissen [Tue, 2 Mar 2010 21:44:32 +0000 (13:44 -0800)]
Cleanspec for switching from Music2 back to Music
Ying Wang [Tue, 2 Mar 2010 17:41:13 +0000 (09:41 -0800)]
Merge "Turn on Proguard by default for user/userdebug builds."
Ficus Kirkpatrick [Tue, 2 Mar 2010 01:02:01 +0000 (17:02 -0800)]
Merge "Make cgrep look for *.c, *.cc, *.cpp, *.h exclusively."
Ficus Kirkpatrick [Tue, 2 Mar 2010 00:51:47 +0000 (16:51 -0800)]
Make cgrep look for *.c, *.cc, *.cpp, *.h exclusively.
It was doing '*.c*' which both included .class files and omitted .h files.
Change-Id: Iedaac4f7ee86df86fdc38341c04ca565f34223b4
Jean-Baptiste Queru [Tue, 2 Mar 2010 00:18:59 +0000 (16:18 -0800)]
De-dupe PRODUCT_COPY_FILES
This allows to explicitly deal with situations where we
want to use PRODUCT_COPY_FILES to manage overrides.
Change-Id: I2f87862e19b973f090099f335e9bdeb0c9f3bfe9
Doug Zongker [Mon, 1 Mar 2010 22:04:40 +0000 (14:04 -0800)]
am
b87e0e1d: (-s ours) Merge commit \'
27bb6f5f\' into manualmerge
Merge commit '
b87e0e1d17299dcd1cdbcfbb80d680b5db8a8cd2'
* commit '
b87e0e1d17299dcd1cdbcfbb80d680b5db8a8cd2':
add signing checker script to releasetools
Xavier Ducrohet [Mon, 1 Mar 2010 20:46:54 +0000 (12:46 -0800)]
Merge "The builders project is gone. Remove it from main.mk"
Doug Zongker [Mon, 1 Mar 2010 20:36:07 +0000 (12:36 -0800)]
Merge commit '
27bb6f5f' into manualmerge
Doug Zongker [Tue, 8 Dec 2009 21:46:44 +0000 (13:46 -0800)]
add signing checker script to releasetools
The check_target_files_signatures determines what key was used to sign
every .apk in a given target_files. It can compare that signature to
that of another target_files (eg, the previous release for that
device) and flag any problems such as .apks signed with a different
key.
(This is a backport of a change in froyo. It does not affect device
code, only the scripts that sign images and OTA packages.)
David 'Digit' Turner [Mon, 1 Mar 2010 19:35:22 +0000 (11:35 -0800)]
Merge "Temporary fix for ARMv7 -user builds."
Jack Palevich [Mon, 1 Mar 2010 18:49:40 +0000 (10:49 -0800)]
Add cleanspec for switching from Music to Music2.
Andy McFadden [Fri, 26 Feb 2010 22:01:06 +0000 (14:01 -0800)]
Merge "Tweak default x86 target arch variant."
Andy McFadden [Fri, 26 Feb 2010 21:26:03 +0000 (13:26 -0800)]
Tweak default x86 target arch variant.
Simply set the arch variant for sim-eng to be "x86".
David 'Digit' Turner [Thu, 25 Feb 2010 22:05:05 +0000 (14:05 -0800)]
Temporary fix for ARMv7 -user builds.
This switches the emulator to "single step" emulation mode which is
slower but seems to work-around the current ARMv7 emulation bug.
This allows the dexreopt passes to go through normally.
Dianne Hackborn [Thu, 25 Feb 2010 04:05:38 +0000 (20:05 -0800)]
Framework no longer links with android-common.
Jean-Baptiste Queru [Thu, 25 Feb 2010 18:04:37 +0000 (10:04 -0800)]
Merge "Allow to explicitly compile the core build configuration"
Jean-Baptiste Queru [Wed, 24 Feb 2010 23:57:23 +0000 (15:57 -0800)]
Don't build OTA package for aosp_emulator_us
This allows "make dist" to work on that configuration.
A better fix would be to allow each product to specify
whether it's an emulator target or a device target, and
to adapt to that, but that'd be a lot more intrusive.
Change-Id: I47708025204a4991466abceb1708a3020a543238
Xavier Ducrohet [Wed, 24 Feb 2010 21:10:55 +0000 (13:10 -0800)]
The builders project is gone. Remove it from main.mk
Change-Id: Ibec7be55667e83d635e1de990772e2730d0e75ff
Joe Onorato [Wed, 24 Feb 2010 19:39:55 +0000 (11:39 -0800)]
Merge "Make mmm handle symbolic links."
Andy McFadden [Wed, 24 Feb 2010 16:29:39 +0000 (08:29 -0800)]
Build the target side of the simulator as 32-bit.
This detail got lost in my previous cleanup change
9b4a812.
Also add a comment explaining why the host side of the
simulator needs to be built in 64-bit (wxWidgets).
Change-Id: I2a867f7f80b43d53e73348b19f6ae834600295f9
Niko Catania [Tue, 23 Feb 2010 23:27:54 +0000 (15:27 -0800)]
Merge "Added cleanup step for the switch to stlport for gtest"
Nicolas Catania [Tue, 23 Feb 2010 23:12:35 +0000 (15:12 -0800)]
Added cleanup step for the switch to stlport for gtest
Jean-Baptiste Queru [Tue, 23 Feb 2010 20:36:56 +0000 (12:36 -0800)]
Get rid of $(combo_target)
The only OS-ARCH combo that would have benefited from it
is linux-x86, but it explicitly used separate configurations
for the HOST_ and TARGET_ side of things.
This makes is clear which files are related to the HOST_
configuration and which ones are related to the TARGET_
configuration, and expands $(combo_target) to the only
possible/reasonable value that it could have had in every
file.
This also cleans up the simulator, by moving it in a single
place in TARGET_linux_x86 (since the only part that's special
is to use HOST_ settings even when building TARGET_ modules).
Change-Id: I2420eeb8cfe539f5807ec99cb3177ffb9f2476d5
Andy McFadden [Tue, 23 Feb 2010 18:24:33 +0000 (10:24 -0800)]
Fix build.
The "set default variant to armv5te if none defined" in the ARM config
was applying to all architectures, but as it turns out only ARM builds
actually cared. When I made a copy of the "set default" code to the x86
config, one or the other would win for builds that didn't specify a
variant. Turns out x86 won, so sim and voles worked, but opal didn't.
Jean-Baptiste Queru [Tue, 23 Feb 2010 17:52:18 +0000 (09:52 -0800)]
Allow to explicitly compile the core build configuration
Also add some missing copyright notices
Change-Id: I86873ad58f3dadbec8be741982bed548cb7e3c8e
Andy McFadden [Tue, 23 Feb 2010 18:00:38 +0000 (10:00 -0800)]
Merge "Provide default variant for x86."
Doug Zongker [Tue, 23 Feb 2010 01:31:16 +0000 (17:31 -0800)]
Merge "pass blobs to applypatch in incremental OTAs"
Doug Zongker [Mon, 22 Feb 2010 23:41:53 +0000 (15:41 -0800)]
pass blobs to applypatch in incremental OTAs
applypatch now takes patches as blob-valued arguments instead of just
filenames, eliminating the need to unpack all patches to /tmp before
starting to apply them.
Revert the last change I made where sha1_check(read_file(...)) was
substituted for apply_patch_check(...). apply_patch_check() knows to
check /cache/saved.file if the original source file is missing or has
a bad checksum, which is important if the device loses power or
otherwise restarts during patching.
Change-Id: Ia5b761474b0f809a5a5eed29455b1b145145699e
Andy McFadden [Mon, 22 Feb 2010 20:44:04 +0000 (12:44 -0800)]
Provide default variant for x86.
The TARGET_ARCH_VARIANT was not being set for x86. This caused some
difficulties when x86-atom tried to include variant-specific versions
of files.
Jean-Baptiste Queru [Mon, 22 Feb 2010 18:52:59 +0000 (10:52 -0800)]
Merge "Allow optional product inheritance"
Joe Onorato [Mon, 22 Feb 2010 18:33:05 +0000 (10:33 -0800)]
Allow optional product inheritance
This allows to use a proper $(call inherit-product) across
the open-source -> non-open-source boundary in a way that
can automatically adapt to whether the non-open-source
part is present or not
Change-Id: I357721c68362ff8c0f90610850b0368adee68ada
Ying Wang [Sat, 20 Feb 2010 02:39:13 +0000 (18:39 -0800)]
Turn on Proguard by default for user/userdebug builds.
Ben Cheng [Fri, 19 Feb 2010 22:49:11 +0000 (14:49 -0800)]
Clean up libdvm variants.
Doug Zongker [Fri, 19 Feb 2010 20:41:15 +0000 (12:41 -0800)]
Merge "relocate applypatch; check patch integrity"
Doug Zongker [Thu, 18 Feb 2010 00:09:18 +0000 (16:09 -0800)]
relocate applypatch; check patch integrity
- Delete the applypatch code (it's being moved to bootable/recovery).
- Change the OTA script generator to verify the sha1sum of all the
patch files after they are unpacked into /tmp.
b/
2361316 - VZW Issue PP628: Continuous reset to Droid logo:
framework-res.apk update failed (CR LIBtt59130)
Change-Id: I5858d48f10127f72e708d50d3de844569d1aff27
Fred Quintana [Fri, 19 Feb 2010 00:00:46 +0000 (16:00 -0800)]
Merge "remove obsolete property ro.config.sync"
Doug Zongker [Thu, 18 Feb 2010 19:43:04 +0000 (11:43 -0800)]
fix makefile inheritance system
The variable inheritance system can leave extra spaces in a variable
when multiple levels of inheritance are used. It can expand:
"@inherit:foo @inherit:bar @inherit:baz"
to
"value @inherit:bar @inherit:baz"
and then
"value @inherit:baz" (if bar has no value for the variable)
and then
"value " (if baz also has no value).
Call strip to remove excess spaces between words after each
replacement pass.
Change-Id: Ic4cfc6fed1865066a6353a522e4bdcb68ec875d3
Chia-chi Yeh [Thu, 18 Feb 2010 04:44:53 +0000 (20:44 -0800)]
Merge "Remove dead shared objects from prelink map."
Chia-chi Yeh [Thu, 18 Feb 2010 04:11:10 +0000 (12:11 +0800)]
Remove dead shared objects from prelink map.
Gilles Debunne [Wed, 17 Feb 2010 23:56:45 +0000 (15:56 -0800)]
Make mmm handle symbolic links.
Use the PWD= /bin/pwd trick used in getopt in mmm so that it can deal with a symlinked
root directory.
Change-Id: Ia8b5ef10cbd10ca05f2301db86f64fdf11ff2840
Fred Quintana [Wed, 17 Feb 2010 21:35:19 +0000 (13:35 -0800)]
remove obsolete property ro.config.sync
Doug Zongker [Wed, 17 Feb 2010 17:07:55 +0000 (09:07 -0800)]
allow java eventlogtags to be generated for packages that aren't included
If there are packages that specify logtags being built that aren't
included in the product, their logtags won't be included in the merged
file. Assign an arbitrary tag number to them so they can be built
anyway.
Change-Id: I4929016bf289b7a814b48bc51f324c09f500fab1
Doug Zongker [Wed, 17 Feb 2010 00:01:43 +0000 (16:01 -0800)]
build the event-log-tags file for the simulator
Change-Id: Idfbc8257e5e3651fe92649d59305f0e24ba60c91
Raphael Moll [Tue, 16 Feb 2010 23:20:25 +0000 (15:20 -0800)]
Merge "Allow sdk/builders to be built using Windows SDK."
Raphael [Tue, 16 Feb 2010 23:16:00 +0000 (15:16 -0800)]
Allow sdk/builders to be built using Windows SDK.
Change-Id: Ic3c8bc2bace166442bf780b625e5d528fea4df9f
Doug Zongker [Tue, 16 Feb 2010 22:32:08 +0000 (14:32 -0800)]
allow EventLog tag numbers to be auto-assigned
With this change, you can specify "?" in place of a tag number in a
.logtags file and the build system will assign numbers to these tags.
(The numbers used shouldn't matter since we translate them back to tag
names whenever the logs are read back.)
This is pretty straightforward to do:
- make merge-event-log-tags.py assign numbers to any tags that specify
"?"
- make the generated java files depend on the merged output
- make java-event-log-tags.py read both the original .logtags and the
merged output, and fill in tag numbers for any "?" using the merged
version.
Change-Id: Icc6ccd705db461d570fc929922a830aa6deaca48
Dan Egnor [Sat, 13 Feb 2010 20:29:06 +0000 (12:29 -0800)]
cleanstep due to removal of classes & packages associated
with the old bundled GoogleCheckin.apk
Jeff Hamilton [Sat, 13 Feb 2010 04:38:35 +0000 (22:38 -0600)]
Cleanspec for my earlier change.
Change-Id: I2259095772768ecfcbf38c65df90cb72c3425e7f
Dima Zavin [Fri, 5 Feb 2010 21:34:34 +0000 (13:34 -0800)]
core: pass nand page size to mkyaffs2image based on BOARD_NAND_PAGE_SIZE boardconfig var
Change-Id: I6feefba15eb1562161e38df03223cb2fba4eb7ee
Signed-off-by: Dima Zavin <dima@android.com>
Doug Zongker [Fri, 12 Feb 2010 18:21:00 +0000 (10:21 -0800)]
change incremental OTA file install order
(Cherry-pick from donut.)
Delete the old recovery-from-boot patch before patching system files,
then install the new one at the end of the process. Also fix an issue
with applypatch returning the wrong status.
Change-Id: I614fce39f307eded696ba792912b863f9fb0580b
Ying Wang [Mon, 25 Jan 2010 17:56:41 +0000 (09:56 -0800)]
Makefile change for build against historical sdk versions.
If LOCAL_SDK_VERSION is current, link against the stub, otherwise
link against prebuilt historical sdk
Ying Wang [Mon, 1 Feb 2010 17:51:23 +0000 (09:51 -0800)]
Fix and enable proguard on packages.
Mathias Agopian [Wed, 10 Feb 2010 01:48:17 +0000 (17:48 -0800)]
add libsurfaceflinger_client and libcamera_client to the prelinkmap
Dan Egnor [Thu, 11 Feb 2010 02:45:40 +0000 (18:45 -0800)]
Add a cleanstep to remove the obsolete EnhancedGoogleSearchProvider.apk,
which otherwise remains stale in system/app and eventually causes problems.
Daniel Sandler [Tue, 9 Feb 2010 21:13:16 +0000 (13:13 -0800)]
Merge "Enable DeskClock on all devices."
Daniel Sandler [Tue, 9 Feb 2010 20:38:15 +0000 (15:38 -0500)]
Enable DeskClock on all devices.
Alas, poor AlarmClock! I knew, him, Froyo: a fellow
of infinite alarm, of most excellent punctuality: he hath
warned me of a meeting a thousand times, and now, how
abhorred in my build it is! My Droid rings at
it. Here hung those beeps that I have snoozed I know
not how oft. Where be your chimes now? Your
roosters? Your songs? Your flashes of alert,
that were wont to set the table on a buzz? Not one
now, to post your own notification? Quite ongoing?
Patrick Scott [Mon, 8 Feb 2010 22:28:15 +0000 (17:28 -0500)]
Put private includes before system includes.
This change allows modules to insert different include paths before the system
include paths. STLPort uses this to find system include files that have the same
name.
Jeff Hamilton [Sat, 6 Feb 2010 04:36:42 +0000 (22:36 -0600)]
Get LOCAL_MANIFEST_PACKAGE_NAME working.
Change-Id: Ieafbf2596252ee3a2fe5d1ad433e8863fbf84601
Brian Carlstrom [Mon, 1 Feb 2010 19:13:32 +0000 (11:13 -0800)]
Add support for LOCAL_JAVACFLAGS
The Dalvik core libraries team would like to start making warnings
errors in certain packages by definition LOCAL_JAVACFLAGS. This will
allow easier debuging of warnings in other packages by supplying
"-Xlint:..." options.
Scott Main [Fri, 5 Feb 2010 23:01:51 +0000 (15:01 -0800)]
Merge "revise script and styles for the expandable widget in the dev guide side nav to allow nested toggle lists. This is necessary for the new resources docs that have an expandable list nested in an expandable list."
Scott Main [Fri, 5 Feb 2010 22:30:08 +0000 (14:30 -0800)]
revise script and styles for the expandable widget in the dev
guide side nav to allow nested toggle lists. This is necessary
for the new resources docs that have an expandable list nested
in an expandable list.
The Android Open Source Project [Fri, 5 Feb 2010 22:14:21 +0000 (14:14 -0800)]
am
f925cb32: am
97233468: reconcile main tree with open-source eclair
Merge commit '
f925cb322e693ce2e621dbad3fd1eb8579878710'
* commit '
f925cb322e693ce2e621dbad3fd1eb8579878710': (198 commits)
android-2.1_r1 snapshot
ERD79
ERD78
ERD77D
ERD77C
ERD77B
ERD77
ERD76
ERD75
ERD72
ERD71F
ERD71E
ERD71D
ERD71C
ERD71B
ERD71
ERD70B
ERD70
ERD69
ERD68B
...
Joe Onorato [Fri, 5 Feb 2010 01:37:21 +0000 (17:37 -0800)]
Add an inherit-package macro to the build system.
This lets you use the source code from one apk to build a new one
with a new module name, a new android package name and optionally,
a new certificate.
To use this, in a makefile, add this:
$(call inherit-package, \
packages/apps/Music/Android.mk, \
Music, \
MusicFork, \
my_cert, \
com.example.music)
You don't need the LOCAL_PATH and CLEAR_VARS stuff. It will override
only the packages that are defined in the makefile name you give, but
if other modules of other types are defined, you will get an error
saying that it's defined twice. In that case, you need to move the
duplicate library (for example a .so) out into a different makefile.
A LOCAL_OVERRIDES_PACKAGES entry is automatically created for the
forked app.
The Android Open Source Project [Fri, 5 Feb 2010 16:43:41 +0000 (08:43 -0800)]
am
97233468: reconcile main tree with open-source eclair
Merge commit '
97233468715838e42b98abe047c60e108fcc44bd' into eclair-plus-aosp
* commit '
97233468715838e42b98abe047c60e108fcc44bd': (198 commits)
android-2.1_r1 snapshot
ERD79
ERD78
ERD77D
ERD77C
ERD77B
ERD77
ERD76
ERD75
ERD72
ERD71F
ERD71E
ERD71D
ERD71C
ERD71B
ERD71
ERD70B
ERD70
ERD69
ERD68B
...
The Android Open Source Project [Fri, 5 Feb 2010 16:09:32 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
Jean-Baptiste Queru [Fri, 5 Feb 2010 15:16:34 +0000 (07:16 -0800)]
Merge "Look for product configs in device/ in addition to vendor/"
Doug Zongker [Tue, 2 Feb 2010 21:12:04 +0000 (13:12 -0800)]
add UnmountAll function to OTA script; support radio images w/path
Three unrelated changes:
- change the add-radio-file makefile function to support adding files
with paths. (The path part of the pathname is stripped off.)
- add an UnmountAll function to the OTA script generation code, so
that we can explicitly unmount everything we've mounted (in addition
to doing it automatically at the end of the script).
- add the updater API version to the info object passed to
device-specific code.
Change-Id: Ia62b15403c1cc8fce8d9910f291450c8077e49f4
Bjorn Bringert [Wed, 3 Feb 2010 10:51:51 +0000 (02:51 -0800)]
Merge "Add all-logtags-files-under macro"
Bjorn Bringert [Tue, 2 Feb 2010 17:36:20 +0000 (17:36 +0000)]
Add all-logtags-files-under macro
Change-Id: Icb4c7e1bb2dfa4df71f07cb022c92e95a9115019
Brett Chabot [Tue, 2 Feb 2010 18:49:23 +0000 (10:49 -0800)]
Add clean step for AndroidTests.
Needed because AndroidTests.java has been removed.
Doug Zongker [Tue, 2 Feb 2010 17:38:39 +0000 (09:38 -0800)]
am
20d93db1: am
cdb621bf: retry patch using cache if in-place write fails
Merge commit '
20d93db18de9001dcb5af46e4d1d2bac10aa2eca'
* commit '
20d93db18de9001dcb5af46e4d1d2bac10aa2eca':
retry patch using cache if in-place write fails
Doug Zongker [Tue, 2 Feb 2010 16:53:17 +0000 (08:53 -0800)]
am
cdb621bf: retry patch using cache if in-place write fails
Merge commit '
cdb621bfea3083afbea238dbf374826742aca6d0' into eclair-plus-aosp
* commit '
cdb621bfea3083afbea238dbf374826742aca6d0':
retry patch using cache if in-place write fails
Doug Zongker [Tue, 2 Feb 2010 16:44:12 +0000 (08:44 -0800)]
retry patch using cache if in-place write fails
[cherry-pick from donut branch]
Instead of failing outright when yaffs lies about how much space is
free on the filesystem, delete the partially-written output file and
retry using the copy-source-to-cache method instead.
Change all the log statements to printf; mixing stdout and stderr
logging just makes the logs hard to read because they're buffered
differently.
Bjorn Bringert [Mon, 1 Feb 2010 21:39:22 +0000 (21:39 +0000)]
Generate write<TAG> methods in logtags-generated Java code
Change-Id: Iebca77f2f710ee4c15bf7089647f8d79fe79f33a
Brian Carlstrom [Sat, 30 Jan 2010 19:45:03 +0000 (11:45 -0800)]
godir search should ignore .repo directory
Brian Carlstrom [Sat, 30 Jan 2010 19:08:21 +0000 (11:08 -0800)]
Merge "godir should set "T=$(gettop)""
Brian Carlstrom [Sat, 30 Jan 2010 00:39:32 +0000 (16:39 -0800)]
godir should set "T=$(gettop)"
Makoto Onuki [Sat, 30 Jan 2010 00:22:29 +0000 (16:22 -0800)]
Merge "cleanstep: remove email intermediates"
The Android Open Source Project [Fri, 29 Jan 2010 22:07:32 +0000 (14:07 -0800)]
reconcile android-2.1_r1 snapshot
Makoto Onuki [Fri, 29 Jan 2010 21:11:09 +0000 (13:11 -0800)]
cleanstep: remove email intermediates
Sriram Raman [Fri, 29 Jan 2010 19:33:16 +0000 (14:33 -0500)]
Remove Gallery (not 3d) from all builds on master
Ed Heyl [Thu, 28 Jan 2010 23:09:40 +0000 (15:09 -0800)]
am
ffae6f51: (-s ours) am
25a331ab: Merge "Update version string." into eclair
Merge commit '
ffae6f5127387c7a1f5cc49ca3f5f3203f7d15f0'
* commit '
ffae6f5127387c7a1f5cc49ca3f5f3203f7d15f0':
Update version string.
Scott Main [Thu, 28 Jan 2010 23:06:03 +0000 (15:06 -0800)]
am
5729dbfa: am
e6fed880: Merge "docs: accept the enter key on key-down, rather than key-up, in order to be sure we capture this key before anything else. Fixes case where highlighted suggestions don\'t get executed when pressed. Bug:
1909300" into eclair
Merge commit '
5729dbfa00ffb659c5758195b617af4349c0ef75'
* commit '
5729dbfa00ffb659c5758195b617af4349c0ef75':
docs: accept the enter key on key-down, rather than key-up,
Raphael [Thu, 28 Jan 2010 21:43:39 +0000 (13:43 -0800)]
am
ccd0338c: am
e749b5a7: Fix windows make: layoutlib_api moved to sdk.git too.
Merge commit '
ccd0338ce637e62c483a727de04236aa05f989aa'
* commit '
ccd0338ce637e62c483a727de04236aa05f989aa':
Fix windows make: layoutlib_api moved to sdk.git too.
Jesse Wilson [Thu, 28 Jan 2010 21:33:29 +0000 (13:33 -0800)]
Merge "Suppress the annoying "XML missing method" warnings from the doc build."