OSDN Git Service
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".
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"
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
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."
Jesse Wilson [Thu, 28 Jan 2010 18:50:58 +0000 (10:50 -0800)]
Suppress the annoying "XML missing method" warnings from the doc build.
Dirk Dougherty [Thu, 28 Jan 2010 18:48:00 +0000 (10:48 -0800)]
am
262e8214: am
6339cfe8: Merge "doc change: add announce for developer lab at mwc." into eclair
Merge commit '
262e821409fbd59b593e56cb75a339e8a2364533'
* commit '
262e821409fbd59b593e56cb75a339e8a2364533':
doc change: add announce for developer lab at mwc.
Andreas Huber [Wed, 27 Jan 2010 00:23:53 +0000 (16:23 -0800)]
Enable stagefright's http implementation by default.
related-to-bug:
2395398
Suchi Amalapurapu [Wed, 27 Jan 2010 22:14:56 +0000 (14:14 -0800)]
Add DefaultContainerService to core make file
Ed Heyl [Tue, 26 Jan 2010 23:01:17 +0000 (15:01 -0800)]
am
25a331ab: Merge "Update version string." into eclair
Merge commit '
25a331ab870edcf31dbbfab0a9e6f4cef88654f5' into eclair-plus-aosp
* commit '
25a331ab870edcf31dbbfab0a9e6f4cef88654f5':
Update version string.
Scott Main [Tue, 26 Jan 2010 23:01:13 +0000 (15:01 -0800)]
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 '
e6fed8807f469a91e10b64990a7709482378dfa9' into eclair-plus-aosp
* commit '
e6fed8807f469a91e10b64990a7709482378dfa9':
docs: accept the enter key on key-down, rather than key-up,
Ed Heyl [Tue, 26 Jan 2010 22:55:33 +0000 (14:55 -0800)]
Merge "Update version string." into eclair
Dianne Hackborn [Tue, 26 Jan 2010 20:54:40 +0000 (12:54 -0800)]
Update version string.
Change-Id: I9b03dadcbc93109f9c91bb9813a41ec23a6c1448
Valentin Kravtsov [Mon, 18 Jan 2010 18:18:46 +0000 (18:18 +0000)]
Adding clean step
Change-Id: I715681edf2d668ee9b5a483fa82af2e608285f47
Scott Main [Mon, 25 Jan 2010 23:39:40 +0000 (15:39 -0800)]
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
Scott Main [Mon, 25 Jan 2010 22:38:43 +0000 (14:38 -0800)]
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
Doug Zongker [Mon, 25 Jan 2010 22:32:31 +0000 (14:32 -0800)]
Merge "add a .gitignore file to make git ignore *.pyc files"
Raphael [Mon, 25 Jan 2010 22:30:49 +0000 (14:30 -0800)]
am
e749b5a7: Fix windows make: layoutlib_api moved to sdk.git too.
Merge commit '
e749b5a71abe9c3659921c50cc4468a1a4f984f5' into eclair-plus-aosp
* commit '
e749b5a71abe9c3659921c50cc4468a1a4f984f5':
Fix windows make: layoutlib_api moved to sdk.git too.
Raphael [Sat, 23 Jan 2010 02:36:37 +0000 (18:36 -0800)]
Fix windows make: layoutlib_api moved to sdk.git too.
Change-Id: Ia030eda4514361b20a5ecb29c997ab625909228c
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
Dirk Dougherty [Fri, 22 Jan 2010 22:27:55 +0000 (14:27 -0800)]
am
6339cfe8: Merge "doc change: add announce for developer lab at mwc." into eclair
Merge commit '
6339cfe89b62bfa7803ff93c4fc13c9be759f47a' into eclair-plus-aosp
* commit '
6339cfe89b62bfa7803ff93c4fc13c9be759f47a':
doc change: add announce for developer lab at mwc.
Dirk Dougherty [Fri, 22 Jan 2010 22:23:07 +0000 (14:23 -0800)]
Merge "doc change: add announce for developer lab at mwc." into eclair
Dirk Dougherty [Wed, 20 Jan 2010 23:36:11 +0000 (15:36 -0800)]
doc change: add announce for developer lab at mwc.
Bug:
2160782
Change-Id: I363e964f0d35eaf7b2d7593d6a3630196ed6de33
Doug Zongker [Fri, 22 Jan 2010 18:23:45 +0000 (10:23 -0800)]
add a .gitignore file to make git ignore *.pyc files
Change-Id: Ie8877ca9c1152681433a638a5e4d20948326f7ca
Scott Main [Fri, 22 Jan 2010 17:43:09 +0000 (09:43 -0800)]
am
daa3b7a4: am
945ed36e: docs: add the ability to exclude PRE elements from being prettified by adding the class "no-pretty-print" (needs to hyphenate \'prettyprint\', otherwise the prettify script will parse "no-prettyprint" the same as "prettyprint")
Merge commit '
daa3b7a46958206cdac5d21e4235a6dfabb6829a'
* commit '
daa3b7a46958206cdac5d21e4235a6dfabb6829a':
docs: add the ability to exclude PRE elements from being prettified
android-build SharedAccount [Fri, 22 Jan 2010 16:34:06 +0000 (08:34 -0800)]
clean step for JIT switch
Bjorn Bringert [Tue, 19 Jan 2010 20:10:32 +0000 (20:10 +0000)]
Cleanstep to remove old QuickSearchBox.apk
Without this, BrowserProvder crashes with:
E/AndroidRuntime( 875): java.lang.RuntimeException: Unable to get provider com.android.browser.BrowserProvider: java.lang.NullPointerException
E/AndroidRuntime( 875): at android.app.ActivityThread.installProvider(ActivityThread.java:4269)
E/AndroidRuntime( 875): at android.app.ActivityThread.installContentProviders(ActivityThread.java:4041)
E/AndroidRuntime( 875): at android.app.ActivityThread.handleBindApplication(ActivityThread.java:4000)
E/AndroidRuntime( 875): at android.app.ActivityThread.access$2900(ActivityThread.java:118)
E/AndroidRuntime( 875): at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1900)
E/AndroidRuntime( 875): at android.os.Handler.dispatchMessage(Handler.java:99)
E/AndroidRuntime( 875): at android.os.Looper.loop(Looper.java:123)
E/AndroidRuntime( 875): at android.app.ActivityThread.main(ActivityThread.java:4360)
E/AndroidRuntime( 875): at java.lang.reflect.Method.invokeNative(Native Method)
E/AndroidRuntime( 875): at java.lang.reflect.Method.invoke(Method.java:521)
E/AndroidRuntime( 875): at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:860)
E/AndroidRuntime( 875): at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:618)
E/AndroidRuntime( 875): at dalvik.system.NativeStart.main(Native Method)
E/AndroidRuntime( 875): Caused by: java.lang.NullPointerException
E/AndroidRuntime( 875): at android.os.Parcel.readException(Parcel.java:1224)
E/AndroidRuntime( 875): at android.os.Parcel.readException(Parcel.java:1206)
E/AndroidRuntime( 875): at android.app.ISearchManager$Stub$Proxy.getSearchableInfo(ISearchManager.java:220)
E/AndroidRuntime( 875): at android.app.SearchManager.getSearchableInfo(SearchManager.java:2056)
E/AndroidRuntime( 875): at com.android.browser.BrowserProvider.updateShowWebSuggestions(BrowserProvider.java:410)
E/AndroidRuntime( 875): at com.android.browser.BrowserProvider.onCreate(BrowserProvider.java:363)
E/AndroidRuntime( 875): at android.content.ContentProvider.attachInfo(ContentProvider.java:725)
E/AndroidRuntime( 875): at android.app.ActivityThread.installProvider(ActivityThread.java:4266)
E/AndroidRuntime( 875): ... 12 more
which is a result of an earlier problem in Searchables:
01-19 11:58:46.317 E/AndroidRuntime( 416): java.lang.RuntimeException: Unable to start receiver com.android.quicksearchbox.SearchWidgetProvider: java.lang.SecurityException: Neither user 10033 nor current process has android.permission.SET_PREFERRED_APPLICATIONS.
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.app.ActivityThread.handleReceiver(ActivityThread.java:2645)
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.app.ActivityThread.access$3100(ActivityThread.java:118)
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1912)
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.os.Handler.dispatchMessage(Handler.java:99)
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.os.Looper.loop(Looper.java:123)
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.app.ActivityThread.main(ActivityThread.java:4360)
01-19 11:58:46.317 E/AndroidRuntime( 416): at java.lang.reflect.Method.invokeNative(Native Method)
01-19 11:58:46.317 E/AndroidRuntime( 416): at java.lang.reflect.Method.invoke(Method.java:521)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:860)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:618)
01-19 11:58:46.317 E/AndroidRuntime( 416): at dalvik.system.NativeStart.main(Native Method)
01-19 11:58:46.317 E/AndroidRuntime( 416): Caused by: java.lang.SecurityException: Neither user 10033 nor current process has android.permission.SET_PREFERRED_APPLICATIONS.
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.os.Parcel.readException(Parcel.java:1218)
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.os.Parcel.readException(Parcel.java:1206)
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.app.ISearchManager$Stub$Proxy.getSearchablesInGlobalSearch(ISearchManager.java:242)
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.app.SearchManager.getSearchablesInGlobalSearch(SearchManager.java:2152)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.quicksearchbox.Sources.addExternalSources(Sources.java:275)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.quicksearchbox.Sources.updateSources(Sources.java:266)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.quicksearchbox.Sources.load(Sources.java:235)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.quicksearchbox.QsbApplication.createSources(QsbApplication.java:96)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.quicksearchbox.QsbApplication.getSources(QsbApplication.java:89)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.quicksearchbox.SearchWidgetProvider.getSources(SearchWidgetProvider.java:222)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.quicksearchbox.SearchWidgetProvider.bindSourceSelector(SearchWidgetProvider.java:162)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.quicksearchbox.SearchWidgetProvider.updateSearchWidgets(SearchWidgetProvider.java:105)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.quicksearchbox.SearchWidgetProvider.onUpdate(SearchWidgetProvider.java:90)
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.appwidget.AppWidgetProvider.onReceive(AppWidgetProvider.java:61)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.quicksearchbox.SearchWidgetProvider.onReceive(SearchWidgetProvider.java:84)
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.app.ActivityThread.handleReceiver(ActivityThread.java:2636)
01-19 11:58:46.317 E/AndroidRuntime( 416): ... 10 more
Change-Id: I66eff8d571a40a6d724c49c258a49ba9d5c18f9f
Bjorn Bringert [Tue, 19 Jan 2010 19:19:44 +0000 (11:19 -0800)]
Merge "Don't build GoogleSearch"
Scott Main [Tue, 19 Jan 2010 19:13:44 +0000 (11:13 -0800)]
am
945ed36e: docs: add the ability to exclude PRE elements from being prettified by adding the class "no-pretty-print" (needs to hyphenate \'prettyprint\', otherwise the prettify script will parse "no-prettyprint" the same as "prettyprint")
Merge commit '
945ed36ec486f83c4546cac8d6bed954dfe32c4e' into eclair-plus-aosp
* commit '
945ed36ec486f83c4546cac8d6bed954dfe32c4e':
docs: add the ability to exclude PRE elements from being prettified
Scott Main [Sat, 16 Jan 2010 01:30:38 +0000 (17:30 -0800)]
docs: add the ability to exclude PRE elements from being prettified
by adding the class "no-pretty-print" (needs to hyphenate 'prettyprint',
otherwise the prettify script will parse "no-prettyprint" the same as
"prettyprint")
Bjorn Bringert [Mon, 18 Jan 2010 22:11:36 +0000 (22:11 +0000)]
Don't build GoogleSearch
GoogleSearch is being replaced by QuickSearchBox, which
includes Google search.
Change-Id: Ief2d1136b8977b0fc6e2b5d97221e5c0bc620daf
Joe Onorato [Fri, 15 Jan 2010 23:23:35 +0000 (18:23 -0500)]
cleanspec for the google_voiceime generated files.
Jeff Hamilton [Thu, 14 Jan 2010 20:37:37 +0000 (14:37 -0600)]
Fix the build.
Bjorn Bringert [Thu, 14 Jan 2010 17:33:44 +0000 (17:33 +0000)]
Allow multiple directories in LOCAL_RESOURCE_DIR
Before, LOCAL_RESOURCE_DIR got messed up when the build system
tried to find the whole LOCAL_RESOURCE_DIR string in each
overlay directory.
This change splits LOCAL_RESOURCE_DIR before appending it to
the overlay directory paths.
I've verified that this now works:
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/overlay $(LOCAL_PATH)/res
Change-Id: Iea47f94a14720af0ca4b422aec30acf4acbe13cf