OSDN Git Service
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.
Phil Dubach [Wed, 29 Apr 2009 18:02:43 +0000 (11:02 -0700)]
am
e3a5777: am
ccd2def: AI 147847: CTS: Fix core test dependencies in CT
Merge commit '
e3a5777a67b09bd54500c1b78c714972fa4793ef'
* commit '
e3a5777a67b09bd54500c1b78c714972fa4793ef':
AI 147847: CTS: Fix core test dependencies in CTS makefile
Scott Main [Wed, 29 Apr 2009 18:02:43 +0000 (11:02 -0700)]
am
ee1e5a3: am
6b894c8: AI 147808: add "current sdk" link using the new
Merge commit '
ee1e5a3da8b50c92d0fb2a28211bf71b93f9d1f5'
* commit '
ee1e5a3da8b50c92d0fb2a28211bf71b93f9d1f5':
AI 147808: add "current sdk" link using the new sdk.current variable
Dirk Dougherty [Wed, 29 Apr 2009 18:02:43 +0000 (11:02 -0700)]
am
9f7d4f2: am
099403d: AI 147796: Add widget design guidelines to new U
Merge commit '
9f7d4f2351bf59e7a77d4377add18ffb511bcc55'
* commit '
9f7d4f2351bf59e7a77d4377add18ffb511bcc55':
AI 147796: Add widget design guidelines to new UI Guidelines area in dev guide.
Bill Napier [Wed, 29 Apr 2009 18:02:43 +0000 (11:02 -0700)]
am
e468abd: am
f22b9a0: AI 147775: Also add ApiDemos to make sure it get
Merge commit '
e468abda1c64923908ae711743d3e8c9f1b4a477'
* commit '
e468abda1c64923908ae711743d3e8c9f1b4a477':
AI 147775: Also add ApiDemos to make sure it gets included in the TestCase repository as
Jorg Pleumann [Wed, 29 Apr 2009 18:02:43 +0000 (11:02 -0700)]
am
ecc08d0: am
b3e0126: AI 147731: Forgot to submit the build changes fo
Merge commit '
ecc08d02b18f67a84df2f69e0d807761fc8dad15'
* commit '
ecc08d02b18f67a84df2f69e0d807761fc8dad15':
AI 147731: Forgot to submit the build changes for the
Dirk Dougherty [Wed, 29 Apr 2009 18:02:43 +0000 (11:02 -0700)]
am
37ca5d1: am
19a4bd1: AI 147710: Add redirects for sdk/preview pages.
Merge commit '
37ca5d11b32399b2924f56e5d8e6dc414f8d1018'
* commit '
37ca5d11b32399b2924f56e5d8e6dc414f8d1018':
AI 147710: Add redirects for sdk/preview pages.
Scott Main [Wed, 29 Apr 2009 18:02:43 +0000 (11:02 -0700)]
am
3bc7430: am
6190dfe: AI 147615: remove sdk version in parentheses fro
Merge commit '
3bc74303857538055b906d1f01077d77e6776248'
* commit '
3bc74303857538055b906d1f01077d77e6776248':
AI 147615: remove sdk version in parentheses from page title
Bill Napier [Wed, 29 Apr 2009 18:02:43 +0000 (11:02 -0700)]
am
41ddfa9: am
f23f5b4: AI 147479: Update list of CTS test packages.
Merge commit '
41ddfa903fe4e91e51d978d30bbbe6748ed1f100'
* commit '
41ddfa903fe4e91e51d978d30bbbe6748ed1f100':
AI 147479: Update list of CTS test packages.
Android (Google) Code Review [Wed, 29 Apr 2009 18:02:43 +0000 (11:02 -0700)]
am
a47b47a: Merge change 530 into donut
Merge commit '
a47b47ad120b6410b2159722680907c53217c09c'
* commit '
a47b47ad120b6410b2159722680907c53217c09c':
Remove obsolete activitycreator from windows SDK makefile.
Karl Rosaen [Wed, 29 Apr 2009 18:02:43 +0000 (11:02 -0700)]
am
663c2ca: Merge branch \'readonly-p4-donut\' into donut
Merge commit '
663c2cadef9a52dd1a9025f1fe22c5d84a3e004f'
* commit '
663c2cadef9a52dd1a9025f1fe22c5d84a3e004f':
AI 147564: Merge back from search branch to donut. Notes:
Android (Google) Code Review [Wed, 29 Apr 2009 18:02:43 +0000 (11:02 -0700)]
am
c33670e: Merge change 488 into donut
Merge commit '
c33670e1b6961da1d7121b16ef23d10b9f6289d6'
* commit '
c33670e1b6961da1d7121b16ef23d10b9f6289d6':
add -n option to turn off prereq check when build OTA packages
Dirk Dougherty [Wed, 29 Apr 2009 04:52:48 +0000 (21:52 -0700)]
am
12741f5: AI 147874: Fix format and link errors in docs.
Merge commit '
12741f56acf0a8a4feccea537d066ae6882499ce' into donut
* commit '
12741f56acf0a8a4feccea537d066ae6882499ce':
AI 147874: Fix format and link errors in docs.
Phil Dubach [Wed, 29 Apr 2009 04:52:48 +0000 (21:52 -0700)]
am
ccd2def: AI 147847: CTS: Fix core test dependencies in CTS makefile
Merge commit '
ccd2def288d02ce5adab10bb28878fff05b70aed' into donut
* commit '
ccd2def288d02ce5adab10bb28878fff05b70aed':
AI 147847: CTS: Fix core test dependencies in CTS makefile
Scott Main [Wed, 29 Apr 2009 04:52:48 +0000 (21:52 -0700)]
am
6b894c8: AI 147808: add "current sdk" link using the new sdk.current
Merge commit '
6b894c8cec676cf0811743c864bcb1937714f2c0' into donut
* commit '
6b894c8cec676cf0811743c864bcb1937714f2c0':
AI 147808: add "current sdk" link using the new sdk.current variable
Dirk Dougherty [Wed, 29 Apr 2009 04:52:48 +0000 (21:52 -0700)]
am
099403d: AI 147796: Add widget design guidelines to new UI Guidelines
Merge commit '
099403d15d1f87e7a17f8e2aa3d9a8bc4afa4500' into donut
* commit '
099403d15d1f87e7a17f8e2aa3d9a8bc4afa4500':
AI 147796: Add widget design guidelines to new UI Guidelines area in dev guide.
Bill Napier [Wed, 29 Apr 2009 04:52:48 +0000 (21:52 -0700)]
am
f22b9a0: AI 147775: Also add ApiDemos to make sure it gets included i
Merge commit '
f22b9a0ad531f66eb0b5710abae1feefecc42c2b' into donut
* commit '
f22b9a0ad531f66eb0b5710abae1feefecc42c2b':
AI 147775: Also add ApiDemos to make sure it gets included in the TestCase repository as
Jorg Pleumann [Wed, 29 Apr 2009 04:52:48 +0000 (21:52 -0700)]
am
b3e0126: AI 147731: Forgot to submit the build changes for the
Merge commit '
b3e0126a7a2d32fbae2638e9419739d2d3907c40' into donut
* commit '
b3e0126a7a2d32fbae2638e9419739d2d3907c40':
AI 147731: Forgot to submit the build changes for the
Dirk Dougherty [Wed, 29 Apr 2009 04:52:48 +0000 (21:52 -0700)]
am
19a4bd1: AI 147710: Add redirects for sdk/preview pages.
Merge commit '
19a4bd164eec255f62cde30f4afc39f0aeb35c04' into donut
* commit '
19a4bd164eec255f62cde30f4afc39f0aeb35c04':
AI 147710: Add redirects for sdk/preview pages.
Scott Main [Wed, 29 Apr 2009 04:52:48 +0000 (21:52 -0700)]
am
6190dfe: AI 147615: remove sdk version in parentheses from page title
Merge commit '
6190dfe937d9972637129f86858272adcd83bd93' into donut
* commit '
6190dfe937d9972637129f86858272adcd83bd93':
AI 147615: remove sdk version in parentheses from page title
Bill Napier [Wed, 29 Apr 2009 04:52:48 +0000 (21:52 -0700)]
am
f23f5b4: AI 147479: Update list of CTS test packages.
Merge commit '
f23f5b486650a923e58e3e79b8ec23cc725b7b33' into donut
* commit '
f23f5b486650a923e58e3e79b8ec23cc725b7b33':
AI 147479: Update list of CTS test packages.
Dirk Dougherty [Tue, 28 Apr 2009 01:13:09 +0000 (18:13 -0700)]
AI 147874: Fix format and link errors in docs.
BUG=
1790234
Automated import of CL 147874
Phil Dubach [Mon, 27 Apr 2009 19:07:38 +0000 (12:07 -0700)]
AI 147847: CTS: Fix core test dependencies in CTS makefile
The core test descriptions did not list all dependencies. When building cts
for the first time, the descriptions were generated before the cts
repository was erased.
BUG=
1813815
Automated import of CL 147847
Scott Main [Mon, 27 Apr 2009 06:18:20 +0000 (23:18 -0700)]
AI 147808: add "current sdk" link using the new sdk.current variable
BUG=
1790234
Automated import of CL 147808
Dirk Dougherty [Sun, 26 Apr 2009 06:09:51 +0000 (23:09 -0700)]
AI 147796: Add widget design guidelines to new UI Guidelines area in dev guide.
BUG=
1790234
Automated import of CL 147796
Bill Napier [Sat, 25 Apr 2009 01:26:58 +0000 (18:26 -0700)]
AI 147775: Also add ApiDemos to make sure it gets included in the TestCase repository as
well.
BUG=
1810821
Automated import of CL 147775
Android (Google) Code Review [Sat, 25 Apr 2009 00:08:46 +0000 (17:08 -0700)]
Merge change 530 into donut
* changes:
Remove obsolete activitycreator from windows SDK makefile.
Jorg Pleumann [Fri, 24 Apr 2009 20:40:00 +0000 (13:40 -0700)]
AI 147731: Forgot to submit the build changes for the
luni.AllTests removal.
Automated import of CL 147731
Dirk Dougherty [Fri, 24 Apr 2009 18:30:32 +0000 (11:30 -0700)]
AI 147710: Add redirects for sdk/preview pages.
BUG=
1790234
Automated import of CL 147710
Scott Main [Fri, 24 Apr 2009 06:08:46 +0000 (23:08 -0700)]
AI 147615: remove sdk version in parentheses from page title
BUG=
1790234
Automated import of CL 147615
Karl Rosaen [Fri, 24 Apr 2009 02:01:31 +0000 (19:01 -0700)]
Merge branch 'readonly-p4-donut' into donut
Karl Rosaen [Fri, 24 Apr 2009 02:00:18 +0000 (19:00 -0700)]
AI 147564: Merge back from search branch to donut. Notes:
- all public apis and framework changes have been reviewed by relevant folks in our branch (e.g romainguy)
- all new public apis are @hidden; they will still get reviewed by api council once we're in git
- other than that, it's mostly GlobalSearch and search dialog stuff, a new apps provider, and some tweaks
to the contacts provider that was reviewed by jham
Automated import of CL 147564
Raphael [Fri, 24 Apr 2009 01:58:26 +0000 (18:58 -0700)]
Remove obsolete activitycreator from windows SDK makefile.
Android (Google) Code Review [Thu, 23 Apr 2009 18:49:30 +0000 (11:49 -0700)]
Merge change 488 into donut
* changes:
add -n option to turn off prereq check when build OTA packages
Doug Zongker [Thu, 23 Apr 2009 18:41:58 +0000 (11:41 -0700)]
add -n option to turn off prereq check when build OTA packages
Developers might legitimately want to install older builds on their
phones, so add option to build OTA packages that will install over
newer builds.
Bill Napier [Thu, 23 Apr 2009 17:14:59 +0000 (10:14 -0700)]
AI 147479: Update list of CTS test packages.
Automated import of CL 147479
Jean-Baptiste Queru [Thu, 23 Apr 2009 01:33:12 +0000 (18:33 -0700)]
Merge donut into master
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:56:50 +0000 (17:56 -0700)]
merge cupcake into donut
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:12:09 +0000 (17:12 -0700)]
Merge donut into master
Dirk Dougherty [Wed, 22 Apr 2009 20:20:39 +0000 (13:20 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Wed, 22 Apr 2009 20:19:29 +0000 (13:19 -0700)]
AI 147303: am: CL 147297 Update Android 1.5 SDK Download, Release Notes, Version Notes, Highlights
Please let me know if you have other "known issues", "resolved issues", or
"highlights".
Also, note that the installing and upgrading docs are being updated in
a different CL, so the new version is not displayed on my staging server.
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 147303
Phil Dubach [Wed, 22 Apr 2009 18:56:14 +0000 (11:56 -0700)]
AI 147397: CTS: Fix VM test description generator
Automated import of CL 147397
Dirk Dougherty [Wed, 22 Apr 2009 07:47:52 +0000 (00:47 -0700)]
Merge branch 'readonly-p4-master'
Dirk Dougherty [Wed, 22 Apr 2009 07:46:34 +0000 (00:46 -0700)]
AI 147305: am: CL 147303 am: CL 147297 Update Android 1.5 SDK Download, Release Notes, Version Notes, Highlights
Please let me know if you have other "known issues", "resolved issues", or
"highlights".
Also, note that the installing and upgrading docs are being updated in
a different CL, so the new version is not displayed on my staging server.
Original author: ddougherty
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147305
Dirk Dougherty [Wed, 22 Apr 2009 01:52:37 +0000 (18:52 -0700)]
AI 147297: Update Android 1.5 SDK Download, Release Notes, Version Notes, Highlights
Please let me know if you have other "known issues", "resolved issues", or
"highlights".
Also, note that the installing and upgrading docs are being updated in
a different CL, so the new version is not displayed on my staging server.
BUG=
1790234
Automated import of CL 147297
Doug Zongker [Wed, 22 Apr 2009 00:12:54 +0000 (17:12 -0700)]
add -w option to ota_from_target_files
Add option to make OTA packages that wipe user data.
Android (Google) Code Review [Tue, 21 Apr 2009 23:06:17 +0000 (16:06 -0700)]
Merge change 362 into donut
* changes:
generalize -t option to add and remove tags in fingerprints
Doug Zongker [Tue, 21 Apr 2009 17:04:51 +0000 (10:04 -0700)]
generalize -t option to add and remove tags in fingerprints
To support devphone and holiday builds we need more control over the
build fingerprint tags; generalize the -t option so we can arbitrarily
add and remove tags.
Xavier Ducrohet [Tue, 21 Apr 2009 20:39:33 +0000 (13:39 -0700)]
Merge branch 'readonly-p4-master'
Xavier Ducrohet [Tue, 21 Apr 2009 20:38:15 +0000 (13:38 -0700)]
AI 147203: am: CL 147198 am: CL 147197 Adds calculator to sdk build.
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147203
Xavier Ducrohet [Tue, 21 Apr 2009 20:36:38 +0000 (13:36 -0700)]
Merge branch 'readonly-p4-donut' into donut
Xavier Ducrohet [Tue, 21 Apr 2009 20:35:21 +0000 (13:35 -0700)]
AI 147198: am: CL 147197 Adds calculator to sdk build.
Original author: xav
Merged from: //branches/cupcake/...
Automated import of CL 147198
Xavier Ducrohet [Tue, 21 Apr 2009 20:35:03 +0000 (13:35 -0700)]
AI 147197: Adds calculator to sdk build.
BUG=
1803455
Automated import of CL 147197
Dirk Dougherty [Tue, 21 Apr 2009 08:01:23 +0000 (01:01 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Tue, 21 Apr 2009 08:00:11 +0000 (01:00 -0700)]
AI 147054: am: CL 147053 Add -hdf primer vars for the platform and release ID associated with the current (most recent) SDK.
Currently, the docs that are specific to each SDK release -- downloading, installing, upgrading, requirements -- are stored in a directory with release-derived name, such as "1.1_r1". This change lets documents use generic links to point into the most recent version specific docs, eg href="{@docRoot}sdk/{sdkCurrent}/installing.html" instead of href="{@docRoot}sdk/1.1_r1/installing.html".
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 147054
Dirk Dougherty [Tue, 21 Apr 2009 00:58:00 +0000 (17:58 -0700)]
Merge branch 'readonly-p4-master'