OSDN Git Service
Doug Zongker [Mon, 12 Oct 2009 19:40:19 +0000 (12:40 -0700)]
am
160028f8: am
f2b32f2a: resolved conflicts for merge of
cfd7db6d to eclair
Merge commit '
160028f8325e9e1face3fc6f17baef498ee3e53d'
* commit '
160028f8325e9e1face3fc6f17baef498ee3e53d':
move recovery image to the top of the OTA package
Jeff Hamilton [Mon, 12 Oct 2009 19:31:01 +0000 (12:31 -0700)]
am
ce017f01: am
979d5567: Merge change I6b350185 into eclair
Merge commit '
ce017f01d006d3e953f3a38f9489360ecd5d0695'
* commit '
ce017f01d006d3e953f3a38f9489360ecd5d0695':
Add a cleanspec rule for the change to bump the API version to 5.
Joe Onorato [Mon, 12 Oct 2009 19:30:57 +0000 (12:30 -0700)]
am
cb9102e0: am
0889661c: eng builds only -- make the thing that makes setupwizard optional actually work.
Merge commit '
cb9102e056e8553745c2abd942852232bfadd98b'
* commit '
cb9102e056e8553745c2abd942852232bfadd98b':
eng builds only -- make the thing that makes setupwizard optional actually work.
Dianne Hackborn [Mon, 12 Oct 2009 19:26:59 +0000 (12:26 -0700)]
am
de7e9e6e: am
0187d842: Part of issue #
2168428: STOP SHIP: Bump API version to 5
Merge commit '
de7e9e6e8fc4044dbc48f1687af92e7aae1d6638'
* commit '
de7e9e6e8fc4044dbc48f1687af92e7aae1d6638':
Part of issue #
2168428: STOP SHIP: Bump API version to 5
Mike Ritter [Mon, 12 Oct 2009 18:43:13 +0000 (11:43 -0700)]
am
ad37305e: am
c51aa3bd: am
69625548: Merge change I239e9f26 into donut
Merge commit '
ad37305edb98df08d71fd27e7d1df6a082a76da3'
* commit '
ad37305edb98df08d71fd27e7d1df6a082a76da3':
Bug in Mac build where it gets confused over case, fix no longer needed.
Brett Chabot [Mon, 12 Oct 2009 18:41:46 +0000 (11:41 -0700)]
am
66e0c458: Merge change I7bc67c51 into eclair-mr2
Merge commit '
66e0c458ae94b8520d8d54c15ecf6a283380b69d'
* commit '
66e0c458ae94b8520d8d54c15ecf6a283380b69d':
Manual merge of donut-gms cts.mk changes.
Marco Nelissen [Mon, 12 Oct 2009 18:41:42 +0000 (11:41 -0700)]
am
fb74a21f: am
f885d876: Merge change I2bdc7ec9 into eclair
Merge commit '
fb74a21f4792e08c1ebee5d0347698885e31d805'
* commit '
fb74a21f4792e08c1ebee5d0347698885e31d805':
Speed up warn.py about 30x by precompiling all the regular expressions.
Joe Onorato [Mon, 12 Oct 2009 18:41:39 +0000 (11:41 -0700)]
am
f13231ef: am
ea79e65f: Merge change Ib7704386 into eclair
Merge commit '
f13231ef8afc6eb2f1ffc14a61d106daa5be8de5'
* commit '
f13231ef8afc6eb2f1ffc14a61d106daa5be8de5':
BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default,
Scott Main [Mon, 12 Oct 2009 18:41:10 +0000 (11:41 -0700)]
Doug Zongker [Thu, 8 Oct 2009 00:19:28 +0000 (17:19 -0700)]
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
Doug Zongker [Thu, 8 Oct 2009 00:05:36 +0000 (17:05 -0700)]
resolved conflicts for merge of
cfd7db6d to eclair
Doug Zongker [Wed, 7 Oct 2009 18:35:53 +0000 (11:35 -0700)]
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.
Jeff Hamilton [Wed, 7 Oct 2009 18:38:17 +0000 (11:38 -0700)]
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.
Joe Onorato [Wed, 7 Oct 2009 18:37:52 +0000 (11:37 -0700)]
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.
Android (Google) Code Review [Wed, 7 Oct 2009 18:05:28 +0000 (14:05 -0400)]
Merge change I6b350185 into eclair
* changes:
Add a cleanspec rule for the change to bump the API version to 5.
Joe Onorato [Wed, 7 Oct 2009 17:01:13 +0000 (10:01 -0700)]
eng builds only -- make the thing that makes setupwizard optional actually work.
Jeff Hamilton [Wed, 7 Oct 2009 05:30:19 +0000 (00:30 -0500)]
Add a cleanspec rule for the change to bump the API version to 5.
Change-Id: I6b35018552b3a9fc2016f054c8a3c2feb41bc0ad
Dianne Hackborn [Wed, 7 Oct 2009 02:22:41 +0000 (19:22 -0700)]
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
Dianne Hackborn [Wed, 7 Oct 2009 00:22:49 +0000 (17:22 -0700)]
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
Mike Ritter [Tue, 6 Oct 2009 18:57:51 +0000 (11:57 -0700)]
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.
Mike Ritter [Tue, 6 Oct 2009 18:46:36 +0000 (11:46 -0700)]
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.
Android (Google) Code Review [Tue, 6 Oct 2009 18:36:51 +0000 (14:36 -0400)]
Merge change I239e9f26 into donut
* changes:
Bug in Mac build where it gets confused over case, fix no longer needed. (cherry picked from commit
e44fadeb49aac9d762f089ee2f23e4a4907a822f)
Android (Google) Code Review [Tue, 6 Oct 2009 18:09:28 +0000 (14:09 -0400)]
Merge change I7bc67c51 into eclair-mr2
* changes:
Manual merge of donut-gms cts.mk changes.
Marco Nelissen [Tue, 6 Oct 2009 18:00:32 +0000 (11:00 -0700)]
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.
Joe Onorato [Tue, 6 Oct 2009 18:00:28 +0000 (11:00 -0700)]
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,
Android (Google) Code Review [Tue, 6 Oct 2009 17:48:38 +0000 (13:48 -0400)]
Merge change I2bdc7ec9 into eclair
* changes:
Speed up warn.py about 30x by precompiling all the regular expressions.
Android (Google) Code Review [Tue, 6 Oct 2009 17:31:06 +0000 (13:31 -0400)]
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.
Scott Main [Tue, 6 Oct 2009 17:26:04 +0000 (10:26 -0700)]
am
5f0241f5: am
37bfad5c: docs only. fix FF2 browser bug in header layout
Merge commit '
5f0241f5d8da1db2721c19d7629115a6c1c71639' into eclair-mr2
* commit '
5f0241f5d8da1db2721c19d7629115a6c1c71639':
docs only.
Scott Main [Tue, 6 Oct 2009 17:14:01 +0000 (10:14 -0700)]
am
37bfad5c: docs only. fix FF2 browser bug in header layout
Merge commit '
37bfad5ce8cc5d2c52ca75770b1c8e895e198e9d' into eclair
* commit '
37bfad5ce8cc5d2c52ca75770b1c8e895e198e9d':
docs only.
Scott Main [Tue, 6 Oct 2009 16:05:48 +0000 (09:05 -0700)]
docs only.
fix FF2 browser bug in header layout
http://b/
2031559
Change-Id: I251364b9abe0d1a05eda1febdd0f7942e2e610e1
android-build SharedAccount [Tue, 6 Oct 2009 09:11:35 +0000 (02:11 -0700)]
am
16d088ec: (-s ours) set BUILD_ID, do not merge
Merge commit '
16d088ec1e02d85f318b4657db91fe0145db67d3'
* commit '
16d088ec1e02d85f318b4657db91fe0145db67d3':
set BUILD_ID, do not merge
Joe Onorato [Mon, 5 Oct 2009 17:06:25 +0000 (10:06 -0700)]
BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default,
and put the commonly used options at the top.
Brett Chabot [Fri, 2 Oct 2009 18:09:41 +0000 (11:09 -0700)]
Manual merge of donut-gms cts.mk changes.
android-build SharedAccount [Fri, 2 Oct 2009 15:01:02 +0000 (08:01 -0700)]
set BUILD_ID, do not merge
Xavier Ducrohet [Thu, 1 Oct 2009 20:47:17 +0000 (13:47 -0700)]
am
814f2a7b: am
d5e2f322: Merge change I57500a81 into eclair
Merge commit '
814f2a7bc8db7271c5c1ff410af30458cf105546'
* commit '
814f2a7bc8db7271c5c1ff410af30458cf105546':
Add assets from all density to the SDK system image.
Scott Main [Thu, 1 Oct 2009 19:22:34 +0000 (12:22 -0700)]
am
95035daf: am
39715e2f: Merge change I962d468d into eclair
Merge commit '
95035daffba91e776734c927c01d104c4478bd9e'
* commit '
95035daffba91e776734c927c01d104c4478bd9e':
revise the deprecated warning to use the 'caution'
Jason Chen [Thu, 1 Oct 2009 19:16:51 +0000 (12:16 -0700)]
am
a7aca39c: am
8d7955dc: Merge change Ie3f5cd4a into eclair
Merge commit '
a7aca39c5b9d8cd626b30fb4f2e6f304163373ca'
* commit '
a7aca39c5b9d8cd626b30fb4f2e6f304163373ca':
Clean steps for a product configuration change.
Xavier Ducrohet [Thu, 1 Oct 2009 19:13:34 +0000 (12:13 -0700)]
am
5feb053c: am
f01a53b6: am
1933782f: Remove kickback/talkback/soundback from SDK.
Merge commit '
5feb053ca7b92e85f5e52e5674b60885edc016e7'
* commit '
5feb053ca7b92e85f5e52e5674b60885edc016e7':
Remove kickback/talkback/soundback from SDK.
Dirk Dougherty [Thu, 1 Oct 2009 19:13:30 +0000 (12:13 -0700)]
am
8fd5fb34: am
96dcc3a9: am
7259bae0: Merge change Ied94685e into donut
Merge commit '
8fd5fb34abdbdb76f8b5970082b4aab4d41d6bf9'
* commit '
8fd5fb34abdbdb76f8b5970082b4aab4d41d6bf9':
Add NDK version reference to template.
Doug Zongker [Thu, 1 Oct 2009 19:10:52 +0000 (12:10 -0700)]
am
da2d06bb: am
c18736b1: remember device-specific releasetools extensions in target-files
Merge commit '
da2d06bb1cf18762257b4f38f698f6d27d6c4412'
* commit '
da2d06bb1cf18762257b4f38f698f6d27d6c4412':
remember device-specific releasetools extensions in target-files
Andy McFadden [Thu, 1 Oct 2009 18:17:31 +0000 (11:17 -0700)]
am
27c6f996: am
c3c136c4: Merge change I95ed76bd into eclair
Merge commit '
27c6f996e9636d6af27a72c4817d082151bc1dea'
* commit '
27c6f996e9636d6af27a72c4817d082151bc1dea':
Update usage and readme for zipalign.
Xavier Ducrohet [Thu, 1 Oct 2009 04:17:20 +0000 (21:17 -0700)]
am
d5e2f322: Merge change I57500a81 into eclair
Merge commit '
d5e2f32239edf1abde61d6abb9d4f74bbe824464' into eclair-plus-aosp
* commit '
d5e2f32239edf1abde61d6abb9d4f74bbe824464':
Add assets from all density to the SDK system image.
Android (Google) Code Review [Thu, 1 Oct 2009 02:58:34 +0000 (22:58 -0400)]
Merge change I57500a81 into eclair
* changes:
Add assets from all density to the SDK system image.
Xavier Ducrohet [Thu, 1 Oct 2009 00:20:11 +0000 (17:20 -0700)]
Add assets from all density to the SDK system image.
Change-Id: I57500a81607edf04337f0a0a75077c00d6d17274
Scott Main [Wed, 30 Sep 2009 22:33:55 +0000 (15:33 -0700)]
am
39715e2f: Merge change I962d468d into eclair
Merge commit '
39715e2f3d19e5b9d6ba8b37643c4417dcaabcd9' into eclair-plus-aosp
* commit '
39715e2f3d19e5b9d6ba8b37643c4417dcaabcd9':
revise the deprecated warning to use the 'caution'
Android (Google) Code Review [Wed, 30 Sep 2009 22:23:08 +0000 (18:23 -0400)]
Merge change I962d468d into eclair
* changes:
revise the deprecated warning to use the 'caution' style and add a line break
Scott Main [Wed, 30 Sep 2009 21:37:32 +0000 (14:37 -0700)]
revise the deprecated warning to use the 'caution'
style and add a line break
Jason Chen [Wed, 30 Sep 2009 20:29:18 +0000 (13:29 -0700)]
am
8d7955dc: Merge change Ie3f5cd4a into eclair
Merge commit '
8d7955dcefec28bf86121e693355bcea882665c3' into eclair-plus-aosp
* commit '
8d7955dcefec28bf86121e693355bcea882665c3':
Clean steps for a product configuration change.
Android (Google) Code Review [Wed, 30 Sep 2009 20:20:41 +0000 (16:20 -0400)]
Merge change Ie3f5cd4a into eclair
* changes:
Clean steps for a product configuration change.
Jason Chen [Wed, 30 Sep 2009 19:25:55 +0000 (12:25 -0700)]
Clean steps for a product configuration change.
Cleans up intermediates produced for a prebuilt app
included in some product configurations.
Mike Ritter [Wed, 30 Sep 2009 19:09:19 +0000 (12:09 -0700)]
Bug in Mac build where it gets confused over case, fix no longer needed.
(cherry picked from commit
e44fadeb49aac9d762f089ee2f23e4a4907a822f)
Xavier Ducrohet [Wed, 30 Sep 2009 18:43:35 +0000 (11:43 -0700)]
am
f01a53b6: am
1933782f: Remove kickback/talkback/soundback from SDK.
Merge commit '
f01a53b67b72de3e4f27bd3103d7223636683e74' into eclair-plus-aosp
* commit '
f01a53b67b72de3e4f27bd3103d7223636683e74':
Remove kickback/talkback/soundback from SDK.
Dirk Dougherty [Wed, 30 Sep 2009 18:43:32 +0000 (11:43 -0700)]
am
96dcc3a9: am
7259bae0: Merge change Ied94685e into donut
Merge commit '
96dcc3a98edfc8e4ed9d6ef851112927b05d71f4' into eclair-plus-aosp
* commit '
96dcc3a98edfc8e4ed9d6ef851112927b05d71f4':
Add NDK version reference to template.
Xavier Ducrohet [Wed, 30 Sep 2009 18:32:13 +0000 (11:32 -0700)]
am
1933782f: Remove kickback/talkback/soundback from SDK.
Merge commit '
1933782fc0a1ec2bddaf0b851b2fa32994e2d3fe' into eclair
* commit '
1933782fc0a1ec2bddaf0b851b2fa32994e2d3fe':
Remove kickback/talkback/soundback from SDK.
Dirk Dougherty [Wed, 30 Sep 2009 18:32:09 +0000 (11:32 -0700)]
am
7259bae0: Merge change Ied94685e into donut
Merge commit '
7259bae08d7915c0d5ba6427c815d7576c0ef045' into eclair
* commit '
7259bae08d7915c0d5ba6427c815d7576c0ef045':
Add NDK version reference to template.
Doug Zongker [Wed, 30 Sep 2009 17:18:57 +0000 (10:18 -0700)]
am
c18736b1: remember device-specific releasetools extensions in target-files
Merge commit '
c18736b1a777c386dc3c5e3f878249770b5edd78' into eclair-plus-aosp
* commit '
c18736b1a777c386dc3c5e3f878249770b5edd78':
remember device-specific releasetools extensions in target-files
Doug Zongker [Wed, 30 Sep 2009 16:20:32 +0000 (09:20 -0700)]
remember device-specific releasetools extensions in target-files
Store the location of the releasetools extensions in the target-files
zip, and make ota_from_target_files use that stored location by
default (though it can still be overridden with -s if desired).
Xavier Ducrohet [Wed, 30 Sep 2009 01:11:05 +0000 (18:11 -0700)]
Remove kickback/talkback/soundback from SDK.
These apps are not in the AOSP tree and cannot be part of the standard SDK
build.
They are available at http://code.google.com/p/eyes-free/
Andy McFadden [Tue, 29 Sep 2009 18:41:46 +0000 (11:41 -0700)]
am
c3c136c4: Merge change I95ed76bd into eclair
Merge commit '
c3c136c4cd5ad5f21e29511b622436518a3c1c9f' into eclair-plus-aosp
* commit '
c3c136c4cd5ad5f21e29511b622436518a3c1c9f':
Update usage and readme for zipalign.
Android (Google) Code Review [Tue, 29 Sep 2009 18:31:43 +0000 (14:31 -0400)]
Merge change I95ed76bd into eclair
* changes:
Update usage and readme for zipalign.
Dave Sparks [Tue, 29 Sep 2009 18:13:45 +0000 (11:13 -0700)]
am
4b71f80a: am
55ad5cc3: Change default notification to OnTheHunt. Bug
2146688.
Merge commit '
4b71f80a1fdb464ec45bad4e5ed93bda4587118c'
* commit '
4b71f80a1fdb464ec45bad4e5ed93bda4587118c':
Change default notification to OnTheHunt. Bug
2146688.
Nick Pelly [Tue, 29 Sep 2009 18:08:37 +0000 (11:08 -0700)]
am
6cfd4351: am
dfb05e7a: cleanspek for Bluetooth API change.
Merge commit '
6cfd4351bb5fb8e1b36fc0ceb3ad3ed36f949324'
* commit '
6cfd4351bb5fb8e1b36fc0ceb3ad3ed36f949324':
cleanspek for Bluetooth API change.
Andy McFadden [Tue, 29 Sep 2009 17:55:32 +0000 (10:55 -0700)]
Update usage and readme for zipalign.
Added the "-c" flag to the README, and added a short description of the
flag meanings to the usage output. Threw in an AOSP copyright one-liner
for good measure.
Marco Nelissen [Tue, 29 Sep 2009 17:19:29 +0000 (10:19 -0700)]
Speed up warn.py about 30x by precompiling all the regular expressions.
Android (Google) Code Review [Tue, 29 Sep 2009 15:43:24 +0000 (11:43 -0400)]
Merge change Ied94685e into donut
* changes:
Add NDK version reference to template.
Dave Sparks [Tue, 29 Sep 2009 00:43:48 +0000 (17:43 -0700)]
am
55ad5cc3: Change default notification to OnTheHunt. Bug
2146688.
Merge commit '
55ad5cc3e64afe9450ceaee0a25a2e8c0e97efea' into eclair-plus-aosp
* commit '
55ad5cc3e64afe9450ceaee0a25a2e8c0e97efea':
Change default notification to OnTheHunt. Bug
2146688.
Dave Sparks [Mon, 28 Sep 2009 21:54:58 +0000 (14:54 -0700)]
Change default notification to OnTheHunt. Bug
2146688.
Nick Pelly [Mon, 28 Sep 2009 20:55:23 +0000 (13:55 -0700)]
am
dfb05e7a: cleanspek for Bluetooth API change.
Merge commit '
dfb05e7a16a98844e4f47d707193fe05f1d3fc13' into eclair-plus-aosp
* commit '
dfb05e7a16a98844e4f47d707193fe05f1d3fc13':
cleanspek for Bluetooth API change.
Nick Pelly [Mon, 28 Sep 2009 20:34:07 +0000 (13:34 -0700)]
cleanspek for Bluetooth API change.
Change-Id: I3bc628b4dae7757aa616f09a69e6c0f6612b7f87
Doug Zongker [Mon, 28 Sep 2009 17:31:10 +0000 (10:31 -0700)]
Doug Zongker [Mon, 28 Sep 2009 17:20:34 +0000 (10:20 -0700)]
am
481c4e65: fix python syntax error
Merge commit '
481c4e650fe6cdb9c63ad04b35d221a2856ca48d' into eclair-plus-aosp
* commit '
481c4e650fe6cdb9c63ad04b35d221a2856ca48d':
fix python syntax error
Doug Zongker [Mon, 28 Sep 2009 17:07:13 +0000 (10:07 -0700)]
fix python syntax error
Jeff Hamilton [Mon, 28 Sep 2009 08:06:35 +0000 (01:06 -0700)]
am
f568c602: am
d85472a7: Fix the build. imgdiff.c needed #include <sys/types.h>.
Merge commit '
f568c602b5726d4212d3e8712b6b13ff3e5230e5'
* commit '
f568c602b5726d4212d3e8712b6b13ff3e5230e5':
Fix the build. imgdiff.c needed #include <sys/types.h>.
Doug Zongker [Sun, 27 Sep 2009 22:42:51 +0000 (15:42 -0700)]
am
92247b38: am
7f116185: add missing include directory
Merge commit '
92247b3893abca1de15a564592b891be493f9d35'
* commit '
92247b3893abca1de15a564592b891be493f9d35':
add missing include directory
Doug Zongker [Sun, 27 Sep 2009 22:42:34 +0000 (15:42 -0700)]
am
a785cb55: am
2bd8abc7: Merge change 27088 into eclair
Merge commit '
a785cb55aa40c4bd251a528edb169d6e1a865169'
* commit '
a785cb55aa40c4bd251a528edb169d6e1a865169':
integrate bsdiff into imgdiff, instead of using subprocess
Scott Main [Sun, 27 Sep 2009 22:40:02 +0000 (15:40 -0700)]
Doug Zongker [Sun, 27 Sep 2009 22:36:37 +0000 (15:36 -0700)]
am
f78bee74: am
ea4a3fa3: Merge change 27066 into eclair
Merge commit '
f78bee7494653f900ecfa7a9c618b1c85ffacda6'
* commit '
f78bee7494653f900ecfa7a9c618b1c85ffacda6':
parallellize computation of binary patches
Jeff Hamilton [Sat, 26 Sep 2009 03:51:36 +0000 (20:51 -0700)]
am
d85472a7: Fix the build. imgdiff.c needed #include <sys/types.h>.
Merge commit '
d85472a7461d0daeb7e17a6f0a7c56f37a2335bc' into eclair-plus-aosp
* commit '
d85472a7461d0daeb7e17a6f0a7c56f37a2335bc':
Fix the build. imgdiff.c needed #include <sys/types.h>.
Jeff Hamilton [Sat, 26 Sep 2009 02:47:52 +0000 (21:47 -0500)]
Fix the build. imgdiff.c needed #include <sys/types.h>.
Change-Id: I82169a926e7df2aa92bac2c4f427bc64f4811362
Doug Zongker [Sat, 26 Sep 2009 00:13:36 +0000 (17:13 -0700)]
am
7f116185: add missing include directory
Merge commit '
7f116185cc254653f9f7abd572d2619d5ddc6f04' into eclair-plus-aosp
* commit '
7f116185cc254653f9f7abd572d2619d5ddc6f04':
add missing include directory
Doug Zongker [Fri, 25 Sep 2009 23:57:31 +0000 (16:57 -0700)]
add missing include directory
Should have been in change Id98e0870 (though it builds on my machine
even without this...)
Doug Zongker [Fri, 25 Sep 2009 23:52:11 +0000 (16:52 -0700)]
am
2bd8abc7: Merge change 27088 into eclair
Merge commit '
2bd8abc7c676b28bc34294f6b0be28d98520029f' into eclair-plus-aosp
* commit '
2bd8abc7c676b28bc34294f6b0be28d98520029f':
integrate bsdiff into imgdiff, instead of using subprocess
Android (Google) Code Review [Fri, 25 Sep 2009 23:43:55 +0000 (19:43 -0400)]
Merge change 27088 into eclair
* changes:
integrate bsdiff into imgdiff, instead of using subprocess
Scott Main [Fri, 25 Sep 2009 22:10:33 +0000 (15:10 -0700)]
am
6159eead: am
afdb6feb: Merge change 27127 into donut
Merge commit '
6159eead22482c46151b9da077bf2fb8bdad1dbc' into eclair-plus-aosp
* commit '
6159eead22482c46151b9da077bf2fb8bdad1dbc':
docs only.
Scott Main [Fri, 25 Sep 2009 22:00:40 +0000 (15:00 -0700)]
Android (Google) Code Review [Fri, 25 Sep 2009 21:48:11 +0000 (17:48 -0400)]
Merge change 27127 into donut
* changes:
docs only. inherit the line height to resolve vertical scroll issue in WebKit browsers
Scott Main [Fri, 25 Sep 2009 21:15:36 +0000 (14:15 -0700)]
docs only.
inherit the line height to resolve vertical scroll
issue in WebKit browsers
Change-Id: I1707893614e3983e6b53a31229b3e19e584d6950
Doug Zongker [Fri, 25 Sep 2009 19:50:46 +0000 (12:50 -0700)]
am
ea4a3fa3: Merge change 27066 into eclair
Merge commit '
ea4a3fa3d4b027dc4873dc4248983f27cd0bdbca' into eclair-plus-aosp
* commit '
ea4a3fa3d4b027dc4873dc4248983f27cd0bdbca':
parallellize computation of binary patches
Android (Google) Code Review [Fri, 25 Sep 2009 19:40:43 +0000 (15:40 -0400)]
Merge change 27066 into eclair
* changes:
parallellize computation of binary patches
Doug Zongker [Fri, 25 Sep 2009 17:45:39 +0000 (10:45 -0700)]
parallellize computation of binary patches
Change ota_from_target_files to compute binary patches for all the
changed files in the OTA package in parallel. On a recent test build
this cuts incremental construction time roughly in half (6 min to 2
min 40 sec).
Doug Zongker [Fri, 25 Sep 2009 18:52:00 +0000 (11:52 -0700)]
integrate bsdiff into imgdiff, instead of using subprocess
Integrate the bsdiff code into imgdiff so we can just call it rather
than writing temp files and invoking bsdiff as a subprocess. When
computing multiple patches from the same source file, we can also save
time by doing some bsdiff preprocessing on the source file only once.
(Note this renames the existing 'bsdiff.c' -- which actually does
patching in applypatch -- to 'bspatch.c', and introduces a new
bsdiff.c linked into imgdiff.)
Scott Main [Fri, 25 Sep 2009 18:25:14 +0000 (11:25 -0700)]
am
93c80c4f: am
0c44a2a9: am
ad4d4efa: adds a parameter to the URL hash on all search queries. depends on change 3583, in order to handle the new parameter
Merge commit '
93c80c4f073811a8fab78e8b56fc2eef87aa0707'
* commit '
93c80c4f073811a8fab78e8b56fc2eef87aa0707':
adds a parameter to the URL hash on all search queries.
Scott Main [Fri, 25 Sep 2009 18:16:38 +0000 (11:16 -0700)]
am
207ce1fc: am
b91916b4: docs only. change the SDK tab to point to the release notes in offline mode; hide all other languages by default instead of depending on the stylesheet
Merge commit '
207ce1fce5099ac7da18c28f63519d6103a1db32'
* commit '
207ce1fce5099ac7da18c28f63519d6103a1db32':
docs only.
Ed Heyl [Fri, 25 Sep 2009 18:15:23 +0000 (11:15 -0700)]
am
c7e20322: (-s ours) am
8392b831: Merge change 25632 into eclair
Merge commit '
c7e203226dcd537ff014d71fb0923750352838aa'
* commit '
c7e203226dcd537ff014d71fb0923750352838aa':
Set default build ID to eclair (usually this is overridden). Please do not merge.
Scott Main [Fri, 25 Sep 2009 18:10:25 +0000 (11:10 -0700)]
Joe Onorato [Fri, 25 Sep 2009 18:04:55 +0000 (11:04 -0700)]
am
4ff55ba0: am
e62902c9: Fix b/
2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references
Merge commit '
4ff55ba0c7749abb0039fa49024be5f1b0e62de2'
* commit '
4ff55ba0c7749abb0039fa49024be5f1b0e62de2':
Fix http://b/
2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references
Joe Onorato [Fri, 25 Sep 2009 18:04:51 +0000 (11:04 -0700)]
am
73270d49: am
f88d14c1: Cleanspec entry for the old launcher on
Merge commit '
73270d49e0716dae7d59b7e0475a53b85f970576'
* commit '
73270d49e0716dae7d59b7e0475a53b85f970576':
Cleanspec entry for the old launcher on
David 'Digit' Turner [Fri, 25 Sep 2009 17:59:31 +0000 (10:59 -0700)]
Dave Bort [Fri, 25 Sep 2009 17:51:31 +0000 (10:51 -0700)]
am
9db1fc2b: am
b392641d: Make fail if it\'s called after including
Merge commit '
9db1fc2bea0b75b59ad52f94faa1e7d66209d2d2'
* commit '
9db1fc2bea0b75b59ad52f94faa1e7d66209d2d2':
Make $(my-dir) fail if it's called after including $(CLEAR_VARS)
Mike Lockwood [Fri, 25 Sep 2009 17:51:28 +0000 (10:51 -0700)]
am
1c418073: am
f4dc5f07: cleanspec.mk: clean GPS related binaries.
Merge commit '
1c4180738249a582a1b3f7c39f6d9f81c9c6f78d'
* commit '
1c4180738249a582a1b3f7c39f6d9f81c9c6f78d':
cleanspec.mk: clean GPS related binaries.
OSDN Git Service
