Commit graph

965 commits

Author SHA1 Message Date
Doug Zongker
5e98e6f05c use aapt to build jar files instead of the system zip (DO NOT MERGE)
By using 'aapt add' instead of whatever 'zip' utility happens to be
installed on the machine, we get files that are imgdiff-friendly,
which makes for smaller incremental OTAs.

(This is a cherry-pick of a change already submitted to eclair-mr2;
the change was approved for mr1.)
2009-10-19 17:05:46 -07:00
Steve Block
9234663c55 WebKit clean required by merge with new WebKit version.
Change-Id: I59377d6a0420bfb13b25b4ed7240b47e8aae6114
2009-10-19 18:41:07 +01:00
Dirk Dougherty
fce6b45f62 doc change: template/asset changes for sdk package. 2009-10-16 17:14:33 -07:00
Android (Google) Code Review
6ebf443631 Merge change I04432db5 into eclair-mr2
* changes:
  use aapt to build jar files instead of the system zip
2009-10-13 17:12:59 -04:00
Raphael
feec1ce3e0 am aa569862: Windows SDK: support tools/sdklauncher and tools/layoutopt
Merge commit 'aa569862dee45bfa72d342e9982cb5205df9bf04' into eclair-mr2

* commit 'aa569862dee45bfa72d342e9982cb5205df9bf04':
  Windows SDK: support tools/sdklauncher and tools/layoutopt
2009-10-13 12:17:40 -07:00
Raphael
aa569862de Windows SDK: support tools/sdklauncher and tools/layoutopt
Change-Id: Iac7d7a0cdc439b2bb1e334e82fe0f354b14d7001
2009-10-12 16:16:02 -07:00
Doug Zongker
9e4374be2c use aapt to build jar files instead of the system zip
By using 'aapt add' instead of whatever 'zip' utility happens to be
installed on the machine, we get files that are imgdiff-friendly,
which makes for smaller incremental OTAs.
2009-10-09 12:14:03 -07:00
Dianne Hackborn
3f7405e994 am ff6f3fe4: Finish issue #2168428: STOP SHIP: Bump API version to 5.
Merge commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9' into eclair-mr2

* commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9':
  Finish issue #2168428: STOP SHIP: Bump API version to 5.
2009-10-08 21:07:12 -07:00
Dianne Hackborn
ff6f3fe448 Finish issue #2168428: STOP SHIP: Bump API version to 5.
We are now 2.0.  Note that CorpCal and PhoneConfig are now gone
until their prebuilts are updated.

Change-Id: I26d13d6b75f5633113d82b8d90788d8bbc915014
2009-10-08 20:50:27 -07:00
Brett Chabot
01c8ef9f51 Merge commit '1b3886b8' into manualmerge 2009-10-08 17:24:02 -07:00
Brett Chabot
e4e3a85fae Merge commit 'af6ccb69' into manualmerge 2009-10-08 13:47:07 -07:00
Brett Chabot
1b3886b848 am 45dc54f6: Add speech tests to CTS makefile.
Merge commit '45dc54f680faea12519870db356f84924c00687d' into eclair

* commit '45dc54f680faea12519870db356f84924c00687d':
  Add speech tests to CTS makefile.
2009-10-08 10:48:24 -07:00
Brett Chabot
af6ccb69fe am 30e1f2bd: Add dpi tests to CTS.
Merge commit '30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408' into eclair

* commit '30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408':
  Add dpi tests to CTS.
2009-10-08 10:48:20 -07:00
Brett Chabot
45dc54f680 Add speech tests to CTS makefile. 2009-10-08 10:00:37 -07:00
Brett Chabot
30e1f2bdd8 Add dpi tests to CTS. 2009-10-08 10:00:37 -07:00
Android (Google) Code Review
2bd9027d0a Merge change I5bbd2294 into eclair-mr2
* changes:
  For Ying Wang:
2009-10-07 21:09:17 -04:00
Doug Zongker
160028f832 am f2b32f2a: resolved conflicts for merge of cfd7db6d to eclair
Merge commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4' into eclair-mr2

* commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4':
  move recovery image to the top of the OTA package
2009-10-07 17:19:28 -07:00
Doug Zongker
f2b32f2a4b resolved conflicts for merge of cfd7db6d to eclair 2009-10-07 17:05:36 -07:00
Sriram Raman
5bbd2294e9 For Ying Wang:
Fix "argument list too long" build error bug.
2009-10-07 16:27:38 -07:00
Doug Zongker
cfd7db6d84 move recovery image to the top of the OTA package
Make the recovery image be the first thing installed in system/ in the
OTA package, so it will get installed even if the system partition
fills during OTA installation.
2009-10-07 16:26:00 -07:00
Jeff Hamilton
ce017f01d0 am 979d5567: Merge change I6b350185 into eclair
Merge commit '979d5567b72b4f3a8219b4786f9f512601645121' into eclair-mr2

* commit '979d5567b72b4f3a8219b4786f9f512601645121':
  Add a cleanspec rule for the change to bump the API version to 5.
2009-10-07 11:38:17 -07:00
Joe Onorato
cb9102e056 am 0889661c: eng builds only -- make the thing that makes setupwizard optional actually work.
Merge commit '0889661cd890e49a4827da0dc5d583274347d178' into eclair-mr2

* commit '0889661cd890e49a4827da0dc5d583274347d178':
  eng builds only -- make the thing that makes setupwizard optional actually work.
2009-10-07 11:37:52 -07:00
Android (Google) Code Review
979d5567b7 Merge change I6b350185 into eclair
* changes:
  Add a cleanspec rule for the change to bump the API version to 5.
2009-10-07 14:05:28 -04:00
Joe Onorato
0889661cd8 eng builds only -- make the thing that makes setupwizard optional actually work. 2009-10-07 10:01:13 -07:00
Jeff Hamilton
c171f00fc7 Add a cleanspec rule for the change to bump the API version to 5.
Change-Id: I6b35018552b3a9fc2016f054c8a3c2feb41bc0ad
2009-10-07 00:30:19 -05:00
Dianne Hackborn
de7e9e6e8f am 0187d842: Part of issue #2168428: STOP SHIP: Bump API version to 5
Merge commit '0187d84264fb6cf67650354c8c5da0a0712dbb0b' into eclair-mr2

* commit '0187d84264fb6cf67650354c8c5da0a0712dbb0b':
  Part of issue #2168428: STOP SHIP: Bump API version to 5
2009-10-06 19:22:41 -07:00
Dianne Hackborn
0187d84264 Part of issue #2168428: STOP SHIP: Bump API version to 5
This bumps the API version.  We are still going to be an Eclair
development version until prebuilts are updated.

Change-Id: Ie76f3cda15b6c2c0b924db614e8024c04ce5a035
2009-10-06 17:22:49 -07:00
Mike Ritter
ad37305edb am c51aa3bd: am 69625548: Merge change I239e9f26 into donut
Merge commit 'c51aa3bd0d4dab1e8d842db4afd6053e0111d84a' into eclair-mr2

* commit 'c51aa3bd0d4dab1e8d842db4afd6053e0111d84a':
  Bug in Mac build where it gets confused over case, fix no longer needed.
2009-10-06 11:57:51 -07:00
Mike Ritter
c51aa3bd0d am 69625548: Merge change I239e9f26 into donut
Merge commit '69625548bf020685cdcb57dffe8f34aba80f11e5' into eclair

* commit '69625548bf020685cdcb57dffe8f34aba80f11e5':
  Bug in Mac build where it gets confused over case, fix no longer needed.
2009-10-06 11:46:36 -07:00
Android (Google) Code Review
69625548bf Merge change I239e9f26 into donut
* changes:
  Bug in Mac build where it gets confused over case, fix no longer needed. (cherry picked from commit e44fadeb49)
2009-10-06 14:36:51 -04:00
Android (Google) Code Review
66e0c458ae Merge change I7bc67c51 into eclair-mr2
* changes:
  Manual merge of donut-gms cts.mk changes.
2009-10-06 14:09:28 -04:00
Marco Nelissen
fb74a21f47 am f885d876: Merge change I2bdc7ec9 into eclair
Merge commit 'f885d876a273bc76b0f5a35c9ea2346f4a5b4d59' into eclair-mr2

* commit 'f885d876a273bc76b0f5a35c9ea2346f4a5b4d59':
  Speed up warn.py about 30x by precompiling all the regular expressions.
2009-10-06 11:00:32 -07:00
Joe Onorato
f13231ef8a am ea79e65f: Merge change Ib7704386 into eclair
Merge commit 'ea79e65fc656351ffeae1daa2cc40abba05d56b9' into eclair-mr2

* commit 'ea79e65fc656351ffeae1daa2cc40abba05d56b9':
  BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default,
2009-10-06 11:00:28 -07:00
Android (Google) Code Review
f885d876a2 Merge change I2bdc7ec9 into eclair
* changes:
  Speed up warn.py about 30x by precompiling all the regular expressions.
2009-10-06 13:48:38 -04:00
Android (Google) Code Review
ea79e65fc6 Merge change Ib7704386 into eclair
* changes:
  BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default, and put the commonly used options at the top.
2009-10-06 13:31:06 -04:00
Scott Main
b268d30a5b am 5f0241f5: am 37bfad5c: docs only. fix FF2 browser bug in header layout
Merge commit '5f0241f5d8da1db2721c19d7629115a6c1c71639' into eclair-mr2

* commit '5f0241f5d8da1db2721c19d7629115a6c1c71639':
  docs only.
2009-10-06 10:26:04 -07:00
Scott Main
5f0241f5d8 am 37bfad5c: docs only. fix FF2 browser bug in header layout
Merge commit '37bfad5ce8cc5d2c52ca75770b1c8e895e198e9d' into eclair

* commit '37bfad5ce8cc5d2c52ca75770b1c8e895e198e9d':
  docs only.
2009-10-06 10:14:01 -07:00
Scott Main
37bfad5ce8 docs only.
fix FF2 browser bug in header layout

http://b/2031559

Change-Id: I251364b9abe0d1a05eda1febdd0f7942e2e610e1
2009-10-06 09:27:10 -07:00
Joe Onorato
582b21e87e BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default,
and put the commonly used options at the top.
2009-10-05 10:06:54 -07:00
Brett Chabot
7bc67c5114 Manual merge of donut-gms cts.mk changes. 2009-10-02 11:09:41 -07:00
android-build SharedAccount
16d088ec1e set BUILD_ID, do not merge 2009-10-02 08:01:02 -07:00
Android (Google) Code Review
d5e2f32239 Merge change I57500a81 into eclair
* changes:
  Add assets from all density to the SDK system image.
2009-09-30 22:58:34 -04:00
Xavier Ducrohet
e63137869d Add assets from all density to the SDK system image.
Change-Id: I57500a81607edf04337f0a0a75077c00d6d17274
2009-09-30 17:20:11 -07:00
Android (Google) Code Review
39715e2f3d Merge change I962d468d into eclair
* changes:
  revise the deprecated warning to use the 'caution' style and add a line break
2009-09-30 18:23:08 -04:00
Scott Main
962d468d73 revise the deprecated warning to use the 'caution'
style and add a line break
2009-09-30 14:37:32 -07:00
Android (Google) Code Review
8d7955dcef Merge change Ie3f5cd4a into eclair
* changes:
  Clean steps for a product configuration change.
2009-09-30 16:20:41 -04:00
Jason Chen
e3f5cd4a25 Clean steps for a product configuration change.
Cleans up intermediates produced for a prebuilt app
included in some product configurations.
2009-09-30 12:25:55 -07:00
Mike Ritter
239e9f2671 Bug in Mac build where it gets confused over case, fix no longer needed.
(cherry picked from commit e44fadeb49)
2009-09-30 12:09:19 -07:00
Xavier Ducrohet
f01a53b67b am 1933782f: Remove kickback/talkback/soundback from SDK.
Merge commit '1933782fc0a1ec2bddaf0b851b2fa32994e2d3fe' into eclair

* commit '1933782fc0a1ec2bddaf0b851b2fa32994e2d3fe':
  Remove kickback/talkback/soundback from SDK.
2009-09-30 11:32:13 -07:00
Dirk Dougherty
96dcc3a98e am 7259bae0: Merge change Ied94685e into donut
Merge commit '7259bae08d7915c0d5ba6427c815d7576c0ef045' into eclair

* commit '7259bae08d7915c0d5ba6427c815d7576c0ef045':
  Add NDK version reference to template.
2009-09-30 11:32:09 -07:00