Commit Graph

9037 Commits

Author SHA1 Message Date
Doug Zongker
441dd2b016 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
2009-10-12 12:40:19 -07:00
Marco Nelissen
a470587e5c 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.
2009-10-12 11:41:42 -07:00
Scott Main
67484da8a7 am b268d30a: am 5f0241f5: am 37bfad5c: docs only. fix FF2 browser bug in header layout
Merge commit 'b268d30a5b32a8080992fbf39d825f5ccf5c5289'

* commit 'b268d30a5b32a8080992fbf39d825f5ccf5c5289':
  docs only.
2009-10-12 11:41:10 -07:00
Gaurav Mathur
29b5b2d94f Add new tabs for Compatibility and Get Source to source.android.com framework 2009-10-08 23:54:35 -07:00
Doug Zongker
7484d0e04a am f2b32f2a: resolved conflicts for merge of cfd7db6d to eclair
Merge commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4' into eclair-plus-aosp

* commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4':
  move recovery image to the top of the OTA package
2009-10-07 17:17:45 -07:00
Doug Zongker
f2b32f2a4b resolved conflicts for merge of cfd7db6d to eclair 2009-10-07 17:05:36 -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
Marco Nelissen
7c6d0c2e9e am f885d876: Merge change I2bdc7ec9 into eclair
Merge commit 'f885d876a273bc76b0f5a35c9ea2346f4a5b4d59' into eclair-plus-aosp

* commit 'f885d876a273bc76b0f5a35c9ea2346f4a5b4d59':
  Speed up warn.py about 30x by precompiling all the regular expressions.
2009-10-07 11:54:04 -07:00
Scott Main
6eeedf0124 am 5f0241f5: am 37bfad5c: docs only. fix FF2 browser bug in header layout
Merge commit '5f0241f5d8da1db2721c19d7629115a6c1c71639' into eclair-plus-aosp

* commit '5f0241f5d8da1db2721c19d7629115a6c1c71639':
  docs only.
2009-10-07 11:53:41 -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
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
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
Scott Main
07dc76fee2 am 95035daf: am 39715e2f: Merge change I962d468d into eclair
Merge commit '95035daffba91e776734c927c01d104c4478bd9e'

* commit '95035daffba91e776734c927c01d104c4478bd9e':
  revise the deprecated warning to use the 'caution'
2009-10-01 12:22:34 -07:00
Dirk Dougherty
dfea61dedb am 8fd5fb34: am 96dcc3a9: am 7259bae0: Merge change Ied94685e into donut
Merge commit '8fd5fb34abdbdb76f8b5970082b4aab4d41d6bf9'

* commit '8fd5fb34abdbdb76f8b5970082b4aab4d41d6bf9':
  Add NDK version reference to template.
2009-10-01 12:13:30 -07:00
Doug Zongker
5eec9dd20f 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
2009-10-01 12:10:52 -07:00
Andy McFadden
d5c079ee27 am 27c6f996: am c3c136c4: Merge change I95ed76bd into eclair
Merge commit '27c6f996e9636d6af27a72c4817d082151bc1dea'

* commit '27c6f996e9636d6af27a72c4817d082151bc1dea':
  Update usage and readme for zipalign.
2009-10-01 11:17:31 -07:00
Scott Main
95035daffb am 39715e2f: Merge change I962d468d into eclair
Merge commit '39715e2f3d19e5b9d6ba8b37643c4417dcaabcd9' into eclair-plus-aosp

* commit '39715e2f3d19e5b9d6ba8b37643c4417dcaabcd9':
  revise the deprecated warning to use the 'caution'
2009-09-30 15:33:55 -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
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
Dirk Dougherty
8fd5fb34ab am 96dcc3a9: am 7259bae0: Merge change Ied94685e into donut
Merge commit '96dcc3a98edfc8e4ed9d6ef851112927b05d71f4' into eclair-plus-aosp

* commit '96dcc3a98edfc8e4ed9d6ef851112927b05d71f4':
  Add NDK version reference to template.
2009-09-30 11:43:32 -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
Doug Zongker
da2d06bb1c 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
2009-09-30 10:18:57 -07:00
Doug Zongker
c18736b1a7 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).
2009-09-30 09:20:32 -07:00
Andy McFadden
27c6f996e9 am c3c136c4: Merge change I95ed76bd into eclair
Merge commit 'c3c136c4cd5ad5f21e29511b622436518a3c1c9f' into eclair-plus-aosp

* commit 'c3c136c4cd5ad5f21e29511b622436518a3c1c9f':
  Update usage and readme for zipalign.
2009-09-29 11:41:46 -07:00
Android (Google) Code Review
c3c136c4cd Merge change I95ed76bd into eclair
* changes:
  Update usage and readme for zipalign.
2009-09-29 14:31:43 -04:00
Andy McFadden
95ed76bd3e 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.
2009-09-29 10:55:32 -07:00
Marco Nelissen
2bdc7ec9cf Speed up warn.py about 30x by precompiling all the regular expressions. 2009-09-29 10:19:29 -07:00
Android (Google) Code Review
7259bae08d Merge change Ied94685e into donut
* changes:
  Add NDK version reference to template.
2009-09-29 11:43:24 -04:00
Doug Zongker
7a6f198727 am 2499b8d7: am 481c4e65: fix python syntax error
Merge commit '2499b8d78087edcac97dff4b2d5dd3f14ee8eb3c'

* commit '2499b8d78087edcac97dff4b2d5dd3f14ee8eb3c':
  fix python syntax error
2009-09-28 10:31:10 -07:00
Doug Zongker
2499b8d780 am 481c4e65: fix python syntax error
Merge commit '481c4e650fe6cdb9c63ad04b35d221a2856ca48d' into eclair-plus-aosp

* commit '481c4e650fe6cdb9c63ad04b35d221a2856ca48d':
  fix python syntax error
2009-09-28 10:20:34 -07:00
Doug Zongker
481c4e650f fix python syntax error 2009-09-28 10:07:13 -07:00
Jeff Hamilton
8206868b32 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>.
2009-09-28 01:06:35 -07:00
Doug Zongker
1a008b6c31 am 92247b38: am 7f116185: add missing include directory
Merge commit '92247b3893abca1de15a564592b891be493f9d35'

* commit '92247b3893abca1de15a564592b891be493f9d35':
  add missing include directory
2009-09-27 15:42:51 -07:00
Doug Zongker
8c5b435698 am a785cb55: am 2bd8abc7: Merge change 27088 into eclair
Merge commit 'a785cb55aa40c4bd251a528edb169d6e1a865169'

* commit 'a785cb55aa40c4bd251a528edb169d6e1a865169':
  integrate bsdiff into imgdiff, instead of using subprocess
2009-09-27 15:42:34 -07:00
Scott Main
249be1036a am dfa9bc7a: am 6159eead: am afdb6feb: Merge change 27127 into donut
Merge commit 'dfa9bc7ab1106fcd80d85d57ab71e5a402d0e16c'

* commit 'dfa9bc7ab1106fcd80d85d57ab71e5a402d0e16c':
  docs only.
2009-09-27 15:40:02 -07:00
Doug Zongker
b138371377 am f78bee74: am ea4a3fa3: Merge change 27066 into eclair
Merge commit 'f78bee7494653f900ecfa7a9c618b1c85ffacda6'

* commit 'f78bee7494653f900ecfa7a9c618b1c85ffacda6':
  parallellize computation of binary patches
2009-09-27 15:36:37 -07:00
Jeff Hamilton
f568c602b5 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>.
2009-09-25 20:51:36 -07:00
Jeff Hamilton
d85472a746 Fix the build. imgdiff.c needed #include <sys/types.h>.
Change-Id: I82169a926e7df2aa92bac2c4f427bc64f4811362
2009-09-25 21:47:52 -05:00
Doug Zongker
92247b3893 am 7f116185: add missing include directory
Merge commit '7f116185cc254653f9f7abd572d2619d5ddc6f04' into eclair-plus-aosp

* commit '7f116185cc254653f9f7abd572d2619d5ddc6f04':
  add missing include directory
2009-09-25 17:13:36 -07:00
Doug Zongker
7f116185cc add missing include directory
Should have been in change Id98e0870 (though it builds on my machine
even without this...)
2009-09-25 17:02:20 -07:00
Doug Zongker
a785cb55aa am 2bd8abc7: Merge change 27088 into eclair
Merge commit '2bd8abc7c676b28bc34294f6b0be28d98520029f' into eclair-plus-aosp

* commit '2bd8abc7c676b28bc34294f6b0be28d98520029f':
  integrate bsdiff into imgdiff, instead of using subprocess
2009-09-25 16:52:11 -07:00
Android (Google) Code Review
2bd8abc7c6 Merge change 27088 into eclair
* changes:
  integrate bsdiff into imgdiff, instead of using subprocess
2009-09-25 19:43:55 -04:00
Scott Main
dfa9bc7ab1 am 6159eead: am afdb6feb: Merge change 27127 into donut
Merge commit '6159eead22482c46151b9da077bf2fb8bdad1dbc' into eclair-plus-aosp

* commit '6159eead22482c46151b9da077bf2fb8bdad1dbc':
  docs only.
2009-09-25 15:10:33 -07:00
Scott Main
6159eead22 am afdb6feb: Merge change 27127 into donut
Merge commit 'afdb6feb9b5051f93cecb7fca77cc4a2b3a702ba' into eclair

* commit 'afdb6feb9b5051f93cecb7fca77cc4a2b3a702ba':
  docs only.
2009-09-25 15:00:40 -07:00
Android (Google) Code Review
afdb6feb9b Merge change 27127 into donut
* changes:
  docs only. inherit the line height to resolve vertical scroll issue in WebKit browsers
2009-09-25 17:48:11 -04:00
Scott Main
18a4883ab3 docs only.
inherit the line height to resolve vertical scroll
issue in WebKit browsers

Change-Id: I1707893614e3983e6b53a31229b3e19e584d6950
2009-09-25 14:38:33 -07:00
Doug Zongker
f78bee7494 am ea4a3fa3: Merge change 27066 into eclair
Merge commit 'ea4a3fa3d4b027dc4873dc4248983f27cd0bdbca' into eclair-plus-aosp

* commit 'ea4a3fa3d4b027dc4873dc4248983f27cd0bdbca':
  parallellize computation of binary patches
2009-09-25 12:50:46 -07:00
Android (Google) Code Review
ea4a3fa3d4 Merge change 27066 into eclair
* changes:
  parallellize computation of binary patches
2009-09-25 15:40:43 -04:00