OSDN Git Service
Andreas Huber [Mon, 30 Aug 2010 22:36:58 +0000 (15:36 -0700)]
resolved conflicts for merge of
f739e312 to master
Change-Id: I3be6dbc299d2d761c96a6f00958d9a4c018ec290
Andreas Huber [Mon, 30 Aug 2010 22:23:51 +0000 (15:23 -0700)]
am
a3989611: Cleanspec to make sure everything works consistently after turning off OpenCore.
Merge commit '
a39896119566a952647c392872c0ab99e9de7371' into gingerbread-plus-aosp
* commit '
a39896119566a952647c392872c0ab99e9de7371':
Cleanspec to make sure everything works consistently after turning off OpenCore.
Andreas Huber [Mon, 30 Aug 2010 21:17:14 +0000 (14:17 -0700)]
Cleanspec to make sure everything works consistently after turning off OpenCore.
Change-Id: Icf3ba66b8183e36247b4cfc623643e37f78d7144
related-to-bug:
2941153
Ying Wang [Mon, 30 Aug 2010 20:30:49 +0000 (13:30 -0700)]
am
a681bae5: am
9a8732fb: Link against Mac OSX 10.5 SDK if building on 10.6.
Merge commit '
a681bae5f6d2cc84d0ff54bb117ecd025062bbce'
* commit '
a681bae5f6d2cc84d0ff54bb117ecd025062bbce':
Link against Mac OSX 10.5 SDK if building on 10.6.
Andreas Huber [Mon, 30 Aug 2010 20:30:29 +0000 (13:30 -0700)]
am
aeb2bbc1: am
200f2598: Build without OpenCore by default, remove obsolete opt-in to stagefright.
Merge commit '
aeb2bbc140acfbaa8279f704fd7fc3f4d08c9486'
* commit '
aeb2bbc140acfbaa8279f704fd7fc3f4d08c9486':
Build without OpenCore by default, remove obsolete opt-in to stagefright.
Ying Wang [Mon, 30 Aug 2010 20:20:50 +0000 (13:20 -0700)]
am
9a8732fb: Link against Mac OSX 10.5 SDK if building on 10.6.
Merge commit '
9a8732fb6c6a569495e3695fc1e2b638de209beb' into gingerbread-plus-aosp
* commit '
9a8732fb6c6a569495e3695fc1e2b638de209beb':
Link against Mac OSX 10.5 SDK if building on 10.6.
Andreas Huber [Mon, 30 Aug 2010 20:06:50 +0000 (13:06 -0700)]
am
200f2598: Build without OpenCore by default, remove obsolete opt-in to stagefright.
Merge commit '
200f25984ccc8a9e5fc13bfbcde22c17bc80d410' into gingerbread-plus-aosp
* commit '
200f25984ccc8a9e5fc13bfbcde22c17bc80d410':
Build without OpenCore by default, remove obsolete opt-in to stagefright.
Andreas Huber [Mon, 30 Aug 2010 19:48:03 +0000 (12:48 -0700)]
Build without OpenCore by default, remove obsolete opt-in to stagefright.
Change-Id: I6e08d2136147f4e279f8a5b2b3837e4317faf27c
related-to-bug:
2941153
Ying Wang [Wed, 25 Aug 2010 01:33:22 +0000 (18:33 -0700)]
Link against Mac OSX 10.5 SDK if building on 10.6.
So that tools built on Snow Leopard (10.6) can be used on Leopard (10.5).
Change-Id: I99745ecbe2ad11feaae31d5be31c34c2e0ad7cc5
Raphael Moll [Sun, 29 Aug 2010 00:39:23 +0000 (17:39 -0700)]
am
2a1873b0: am
6ba4b59c: SDK: add hierarchyviewer2 to windows target list.
Merge commit '
2a1873b09c73700d4339f379f4389b26beb81173'
* commit '
2a1873b09c73700d4339f379f4389b26beb81173':
SDK: add hierarchyviewer2 to windows target list.
Raphael Moll [Sun, 29 Aug 2010 00:31:31 +0000 (17:31 -0700)]
am
6ba4b59c: SDK: add hierarchyviewer2 to windows target list.
Merge commit '
6ba4b59c9067b747ab2a4c85621e656c4d4614e3' into gingerbread-plus-aosp
* commit '
6ba4b59c9067b747ab2a4c85621e656c4d4614e3':
SDK: add hierarchyviewer2 to windows target list.
Raphael Moll [Sat, 28 Aug 2010 22:03:40 +0000 (15:03 -0700)]
SDK: add hierarchyviewer2 to windows target list.
Change-Id: I282173ab10930a716861f3774804d3d8484a71f3
Ying Wang [Fri, 27 Aug 2010 23:24:23 +0000 (16:24 -0700)]
Merge "Fix bug."
Ying Wang [Fri, 27 Aug 2010 23:18:15 +0000 (16:18 -0700)]
Fix bug.
Change-Id: I8bee35b7bb3fa0926f768d44a91cb45f76f224f9
Bug:
2957295
Ying Wang [Fri, 27 Aug 2010 22:52:03 +0000 (15:52 -0700)]
Iliyan Malchev [Fri, 27 Aug 2010 22:04:39 +0000 (15:04 -0700)]
Merge "Turn on ASLR by default. The "-a" option now takes an argument (on/off)."
Ying Wang [Fri, 27 Aug 2010 19:14:58 +0000 (12:14 -0700)]
am
cef82129: am
aa6dbe21: Try to fix system.img in update zip file.
Merge commit '
cef82129e1b2a26f883c20521d79175747eac434'
* commit '
cef82129e1b2a26f883c20521d79175747eac434':
Try to fix system.img in update zip file.
Bill Napier [Fri, 27 Aug 2010 17:10:52 +0000 (10:10 -0700)]
Merge "Revert "Fix MonkeyRunner SDK documentation generation.""
Bill Napier [Fri, 27 Aug 2010 16:58:29 +0000 (09:58 -0700)]
Revert "Fix MonkeyRunner SDK documentation generation."
This reverts commit
b47386bb270ec8f8f007d4fc9f7823530b74fdac.
Hristo Bojinov [Fri, 27 Aug 2010 16:32:21 +0000 (09:32 -0700)]
Merge "Increase the Retouch buffer size from 550,000 to 600,000"
Bill Napier [Fri, 27 Aug 2010 16:10:30 +0000 (09:10 -0700)]
Merge "Fix MonkeyRunner SDK documentation generation."
Steve Block [Fri, 27 Aug 2010 12:18:46 +0000 (13:18 +0100)]
Increase the Retouch buffer size from 550,000 to 600,000
The WebKit merge to r66079 built with JSC JavaScript engine triggers the
overflow.
Change-Id: Ifcb92aa019cfb0e7a93d667e15a792554fc0f676
Ying Wang [Thu, 26 Aug 2010 23:07:12 +0000 (16:07 -0700)]
am
ae553143: Refactor a bit.
Merge commit '
ae5531434877478985186dd0fb7ffefa12a74e52' into gingerbread-plus-aosp
* commit '
ae5531434877478985186dd0fb7ffefa12a74e52':
Refactor a bit.
Ying Wang [Thu, 26 Aug 2010 23:04:09 +0000 (16:04 -0700)]
Refactor a bit.
Change-Id: I4573e7a5239536f49571d9222865e2526da573c8
Ying Wang [Thu, 26 Aug 2010 22:25:53 +0000 (15:25 -0700)]
am
aa6dbe21: Try to fix system.img in update zip file.
Merge commit '
aa6dbe2144196bb6f9c1b6b539126250f9ef8af6' into gingerbread-plus-aosp
* commit '
aa6dbe2144196bb6f9c1b6b539126250f9ef8af6':
Try to fix system.img in update zip file.
Ying Wang [Thu, 26 Aug 2010 21:01:50 +0000 (14:01 -0700)]
Try to fix system.img in update zip file.
Change-Id: Ic4f1c7478a22b1f8134ac768904e437fcfea700a
Hristo Bojinov [Thu, 26 Aug 2010 21:35:16 +0000 (14:35 -0700)]
Turn on ASLR by default. The "-a" option now takes an argument (on/off).
Change-Id: I4ddc70f2087c23586fc6aaaff3bb862f83d9779d
Ben Dodson [Thu, 26 Aug 2010 16:44:03 +0000 (09:44 -0700)]
Merge "Continue to use search.html for site searching"
Ying Wang [Thu, 26 Aug 2010 04:21:43 +0000 (21:21 -0700)]
am
485bd44d: am
d421f57d: Fix mkyaffs2image extra flags in the release tools.
Merge commit '
485bd44d0d78f9f612075e17db1adb281741c84f'
* commit '
485bd44d0d78f9f612075e17db1adb281741c84f':
Fix mkyaffs2image extra flags in the release tools.
Ying Wang [Thu, 26 Aug 2010 04:19:29 +0000 (21:19 -0700)]
am
d421f57d: Fix mkyaffs2image extra flags in the release tools.
Merge commit '
d421f57d22009e4d9ce71298c2f93636ff9e7d9d' into gingerbread-plus-aosp
* commit '
d421f57d22009e4d9ce71298c2f93636ff9e7d9d':
Fix mkyaffs2image extra flags in the release tools.
Ying Wang [Thu, 26 Aug 2010 03:39:41 +0000 (20:39 -0700)]
Fix mkyaffs2image extra flags in the release tools.
Change-Id: I806e3e85ef89941edf04352331e25730c491c470
Bill Napier [Thu, 26 Aug 2010 01:16:13 +0000 (18:16 -0700)]
Fix MonkeyRunner SDK documentation generation.
Turns out that find doesn't like being passed paths that don't exist, so
don't do that.
Change-Id: I155cf48625513d1bcbd29329f1949967889dc9cc
Ying Wang [Wed, 25 Aug 2010 23:40:44 +0000 (16:40 -0700)]
am
f11fc5f0: am
fb0a347b: Disable building OTA package if there is no kernel.
Merge commit '
f11fc5f098ab8481887cbbbbb4246f63837b61c9'
* commit '
f11fc5f098ab8481887cbbbbb4246f63837b61c9':
Disable building OTA package if there is no kernel.
Ying Wang [Wed, 25 Aug 2010 23:13:08 +0000 (16:13 -0700)]
am
fb0a347b: Disable building OTA package if there is no kernel.
Merge commit '
fb0a347b747a91173c8a9f845a0362e3f8a9701f' into gingerbread-plus-aosp
* commit '
fb0a347b747a91173c8a9f845a0362e3f8a9701f':
Disable building OTA package if there is no kernel.
Ying Wang [Wed, 25 Aug 2010 23:06:06 +0000 (16:06 -0700)]
Disable building OTA package if there is no kernel.
Change-Id: I9a10cba92dd7f9cccd8cca58a5fa2d3a8b4620eb
Ying Wang [Wed, 25 Aug 2010 22:52:51 +0000 (15:52 -0700)]
resolved conflicts for merge of
480250d3 to master
Change-Id: Ic55950f4b92c7029fd2ff62976cba0d4d738fc23
Ying Wang [Wed, 25 Aug 2010 22:40:29 +0000 (15:40 -0700)]
am
68bb6517: Show command lines run by releasetools.
Merge commit '
68bb65177cc6839e985c0a54343f44494de61d62' into gingerbread-plus-aosp
* commit '
68bb65177cc6839e985c0a54343f44494de61d62':
Show command lines run by releasetools.
Ying Wang [Wed, 25 Aug 2010 22:23:21 +0000 (15:23 -0700)]
Show command lines run by releasetools.
Change-Id: Ic204e6738781c191cd6cefefdb351f8a156b2309
Ying Wang [Wed, 25 Aug 2010 22:13:07 +0000 (15:13 -0700)]
am
eed6860d: am
4de6b5bf: Fix mkbootimg parameters for releasetools.
Merge commit '
eed6860d388f1761405d7165cb4d72e1f038b8a6'
* commit '
eed6860d388f1761405d7165cb4d72e1f038b8a6':
Fix mkbootimg parameters for releasetools.
Ying Wang [Wed, 25 Aug 2010 22:04:45 +0000 (15:04 -0700)]
am
4de6b5bf: Fix mkbootimg parameters for releasetools.
Merge commit '
4de6b5bfc89de95b18514e75329a2ec7491bebbd' into gingerbread-plus-aosp
* commit '
4de6b5bfc89de95b18514e75329a2ec7491bebbd':
Fix mkbootimg parameters for releasetools.
Ying Wang [Wed, 25 Aug 2010 21:29:34 +0000 (14:29 -0700)]
Fix mkbootimg parameters for releasetools.
Change-Id: I6192743e9db415f5fe7f3b82081f8a82061254b3
Bill Napier [Wed, 25 Aug 2010 17:13:00 +0000 (10:13 -0700)]
am
1ad13805: (-s ours) am
0962b719: Merge "DO NOT MERGE: Fix the build by ignoring directories that don\'t exist." into gingerbread
Merge commit '
1ad138059922bcd94674b9d277bd1a83a5ddcdeb'
* commit '
1ad138059922bcd94674b9d277bd1a83a5ddcdeb':
DO NOT MERGE: Fix the build by ignoring directories that don't exist.
Ying Wang [Wed, 25 Aug 2010 17:12:58 +0000 (10:12 -0700)]
am
f3a142b8: am
7eaa4dc2: Merge "Link against Mac OSX 10.5 SDK if building on 10.6." into gingerbread
Merge commit '
f3a142b8d5b4db7299b706653f4fd2952f4e5d8c'
* commit '
f3a142b8d5b4db7299b706653f4fd2952f4e5d8c':
Link against Mac OSX 10.5 SDK if building on 10.6.
Bill Napier [Wed, 25 Aug 2010 17:10:49 +0000 (10:10 -0700)]
am
0962b719: Merge "DO NOT MERGE: Fix the build by ignoring directories that don\'t exist." into gingerbread
Merge commit '
0962b71980b7e850a1ef87766ae12de16ab2efb4' into gingerbread-plus-aosp
* commit '
0962b71980b7e850a1ef87766ae12de16ab2efb4':
DO NOT MERGE: Fix the build by ignoring directories that don't exist.
Ying Wang [Wed, 25 Aug 2010 17:10:13 +0000 (10:10 -0700)]
am
7eaa4dc2: Merge "Link against Mac OSX 10.5 SDK if building on 10.6." into gingerbread
Merge commit '
7eaa4dc2fbc3d7b3d8a0a2576a6fc14507e176a8' into gingerbread-plus-aosp
* commit '
7eaa4dc2fbc3d7b3d8a0a2576a6fc14507e176a8':
Link against Mac OSX 10.5 SDK if building on 10.6.
Jean-Baptiste Queru [Wed, 25 Aug 2010 17:05:10 +0000 (10:05 -0700)]
am
f7a6ead0: Manual merge
Merge commit '
f7a6ead075a9b1edc85eeeca646ced42f112f331'
* commit '
f7a6ead075a9b1edc85eeeca646ced42f112f331':
For the generic board, set /system/bin/sh to mksh to test the transition
Jean-Baptiste Queru [Wed, 25 Aug 2010 17:01:35 +0000 (10:01 -0700)]
Manual merge
Change-Id: Ie74c9c4931d3a1ec34bbdf4307d98c8e66c9ddd5
Bill Napier [Wed, 25 Aug 2010 17:00:59 +0000 (10:00 -0700)]
Merge "DO NOT MERGE: Fix the build by ignoring directories that don't exist." into gingerbread
Bill Napier [Wed, 25 Aug 2010 16:59:14 +0000 (09:59 -0700)]
DO NOT MERGE: Fix the build by ignoring directories that don't exist.
Change-Id: I97ba9eca73f020eae0fa36ae94db35e70c9985d3
Jean-Baptiste Queru [Wed, 25 Aug 2010 16:59:53 +0000 (09:59 -0700)]
am
5f0df7a9: Manual merge
Merge commit '
5f0df7a95bb6b7bbbd6fb0062bef915873f9e5a1'
* commit '
5f0df7a95bb6b7bbbd6fb0062bef915873f9e5a1':
Add new variable TARGET_SHELL := ash (default; or mksh)
Jean-Baptiste Queru [Wed, 25 Aug 2010 16:52:07 +0000 (09:52 -0700)]
Manual merge
Change-Id: I81dd98ba150e936b675ff2323994a1e381512332
Ying Wang [Wed, 25 Aug 2010 16:32:00 +0000 (09:32 -0700)]
Merge "Link against Mac OSX 10.5 SDK if building on 10.6." into gingerbread
Ben Dodson [Wed, 25 Aug 2010 15:50:30 +0000 (08:50 -0700)]
Merge "Updates for new doclava customizations"
Rohit Mungee [Wed, 25 Aug 2010 06:15:23 +0000 (23:15 -0700)]
am
cdc1d6f4: (-s ours) am
cb92616f: Merge "Add support for multiple html directories to droiddoc." into gingerbread
Merge commit '
cdc1d6f45711bdfa5b71513c6d4e63cf5804bc56'
* commit '
cdc1d6f45711bdfa5b71513c6d4e63cf5804bc56':
Add support for multiple html directories to droiddoc.
Rohit Mungee [Wed, 25 Aug 2010 06:01:32 +0000 (23:01 -0700)]
am
cb92616f: Merge "Add support for multiple html directories to droiddoc." into gingerbread
Merge commit '
cb92616f11f4eb07e9f11924c5ad8a78e6ab5bdd' into gingerbread-plus-aosp
* commit '
cb92616f11f4eb07e9f11924c5ad8a78e6ab5bdd':
Add support for multiple html directories to droiddoc.
Rohit Mungee [Wed, 25 Aug 2010 05:58:30 +0000 (22:58 -0700)]
Merge "Add support for multiple html directories to droiddoc." into gingerbread
Bill Napier [Wed, 25 Aug 2010 05:16:01 +0000 (22:16 -0700)]
Add support for multiple html directories to droiddoc.
The goal for adding this support is to allow droiddoc to pull html
files both from the static content and from content generated at
build time.
Change-Id: I5d4b2432aa78b0b3559daacedfb7a29675701f33
Ying Wang [Wed, 25 Aug 2010 01:33:22 +0000 (18:33 -0700)]
Link against Mac OSX 10.5 SDK if building on 10.6.
So that tools built on Snow Leopard (10.6) can be used on Leopard (10.5).
Change-Id: I99745ecbe2ad11feaae31d5be31c34c2e0ad7cc5
Thorsten Glaser [Thu, 3 Jun 2010 17:58:02 +0000 (19:58 +0200)]
For the generic board, set /system/bin/sh to mksh to test the transition
Change-Id: I778bae4060dd404e82fbf9dd5b8a2024c8268402
Thorsten Glaser [Thu, 3 Jun 2010 17:57:02 +0000 (19:57 +0200)]
Add new variable TARGET_SHELL := ash (default; or mksh)
Besides that, add enough magic to build everything tagged
as "shell_$(TARGET_SHELL)" and permit ash/mksh as not unusual
Change-Id: I36c0590ba49f45251d24dc179cb27c8368c3662a
Ben Dodson [Wed, 25 Aug 2010 00:13:08 +0000 (17:13 -0700)]
Continue to use search.html for site searching
Change-Id: I0e3ef90698c2ac06693eb70f140b26b476d51a22
Ben Dodson [Tue, 24 Aug 2010 23:14:02 +0000 (16:14 -0700)]
Updates for new doclava customizations
Change-Id: I98f45e3fe92953968014b2d6589515ca39a5c920
Ben Dodson [Tue, 24 Aug 2010 22:34:36 +0000 (15:34 -0700)]
Merge "Adding android-specific customization for warning of minimum api level"
Ying Wang [Tue, 24 Aug 2010 22:20:47 +0000 (15:20 -0700)]
am
567ec8ed: (-s ours) am
ee4bad51: Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
Merge commit '
567ec8ede3e7cda75c1f3d474d14d78b12a6765f'
* commit '
567ec8ede3e7cda75c1f3d474d14d78b12a6765f':
Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
Ben Dodson [Tue, 24 Aug 2010 21:39:58 +0000 (14:39 -0700)]
Adding android-specific customization for warning of minimum api level
Change-Id: Id211e250f3c42d0239ce9bf126a74997c8b0dc3f
Jean-Baptiste Queru [Tue, 24 Aug 2010 18:55:05 +0000 (11:55 -0700)]
am
b4df3489: am
34acfcf6: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit '
b4df348997795f2e60476ca4b67f9fe5501321db'
* commit '
b4df348997795f2e60476ca4b67f9fe5501321db':
FRG51
FRG49
bump version from 2.2 to 2.2.1 for next froyo release
FRG22D
FRG22C
FRG22B
33b special
FRG33
FRG22
FRG15B
FRG15
FRG01B
FRG08
FRG01
FRF81
Ying Wang [Tue, 24 Aug 2010 18:50:46 +0000 (11:50 -0700)]
am
ee4bad51: Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
Merge commit '
ee4bad51bc7ff49c37c9a105ad68dddf0a3b0d51' into gingerbread-plus-aosp
* commit '
ee4bad51bc7ff49c37c9a105ad68dddf0a3b0d51':
Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
Ying Wang [Tue, 24 Aug 2010 18:21:27 +0000 (11:21 -0700)]
am
2eed660c: am
ffff0028: Pass pagesize to makebootimage.
Merge commit '
2eed660c667550f1b810303b13ee0c7e84455bf0'
* commit '
2eed660c667550f1b810303b13ee0c7e84455bf0':
Pass pagesize to makebootimage.
Ying Wang [Tue, 24 Aug 2010 18:20:45 +0000 (11:20 -0700)]
am
d3b973d8: (-s ours) am
065521be: Backport ext4 support from master [DO NOT MERGE]
Merge commit '
d3b973d8970bcbeab3fd27a070e7373b2fa36072'
* commit '
d3b973d8970bcbeab3fd27a070e7373b2fa36072':
Backport ext4 support from master [DO NOT MERGE]
Ying Wang [Tue, 24 Aug 2010 18:18:07 +0000 (11:18 -0700)]
Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
Original CL: 59920
Change-Id: I81437996670a61e10284293d25a08da8907ad296
Ying Wang [Tue, 24 Aug 2010 18:02:12 +0000 (11:02 -0700)]
am
d4ee2de1: (-s ours) am
ad3cf5f8: Restore OTA for crespo. [DO NOT MERGE]
Merge commit '
d4ee2de1c3b5163926d40879277e6e35ea40924c'
* commit '
d4ee2de1c3b5163926d40879277e6e35ea40924c':
Restore OTA for crespo. [DO NOT MERGE]
Jean-Baptiste Queru [Tue, 24 Aug 2010 18:01:21 +0000 (11:01 -0700)]
am
ed91928a: (-s ours) am
60d1ee3e: Better way to disable OTAs for crespo - DO NOT MERGE
Merge commit '
ed91928a6ca817a9a133ee81cfb2e9745acec21d'
* commit '
ed91928a6ca817a9a133ee81cfb2e9745acec21d':
Better way to disable OTAs for crespo - DO NOT MERGE
Ying Wang [Tue, 24 Aug 2010 17:16:51 +0000 (10:16 -0700)]
am
13a019fe: (-s ours) am
7daa9132: Disable OTA for crespo [DO NOT MERGE]
Merge commit '
13a019fe32e6a0eb3289ad6142173631ac601391'
* commit '
13a019fe32e6a0eb3289ad6142173631ac601391':
Disable OTA for crespo [DO NOT MERGE]
Jean-Baptiste Queru [Tue, 24 Aug 2010 06:36:16 +0000 (23:36 -0700)]
am
34acfcf6: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit '
34acfcf6858fa4c9183d4e4d2e10f15cf932285f' into gingerbread-plus-aosp
* commit '
34acfcf6858fa4c9183d4e4d2e10f15cf932285f':
FRG51
FRG49
bump version from 2.2 to 2.2.1 for next froyo release
FRG22D
FRG22C
FRG22B
33b special
FRG33
FRG22
FRG15B
FRG15
FRG01B
FRG08
FRG01
FRF81
Jean-Baptiste Queru [Tue, 24 Aug 2010 02:07:41 +0000 (19:07 -0700)]
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Change-Id: Ic1040aa7e00cdc01af2f2cb4c741bafe4936904c
Ying Wang [Mon, 23 Aug 2010 20:52:18 +0000 (13:52 -0700)]
am
ffff0028: Pass pagesize to makebootimage.
Merge commit '
ffff0028ae9a83893f71efa370d283e2247bcdd4' into gingerbread-plus-aosp
* commit '
ffff0028ae9a83893f71efa370d283e2247bcdd4':
Pass pagesize to makebootimage.
Ying Wang [Mon, 23 Aug 2010 19:56:25 +0000 (12:56 -0700)]
Pass pagesize to makebootimage.
Change-Id: I719d765245469921de105430fdd92d478ea48e82
Ying Wang [Mon, 23 Aug 2010 18:49:10 +0000 (11:49 -0700)]
am
065521be: Backport ext4 support from master [DO NOT MERGE]
Merge commit '
065521be4fd6965058fbd599bb43fe13101fee7c' into gingerbread-plus-aosp
* commit '
065521be4fd6965058fbd599bb43fe13101fee7c':
Backport ext4 support from master [DO NOT MERGE]
Ying Wang [Mon, 23 Aug 2010 18:34:40 +0000 (11:34 -0700)]
Backport ext4 support from master [DO NOT MERGE]
ext4 support is needed by crespo.
Change-Id: I604cb9ada526ce8ba6b3648171ac1d614a5519a9
Ying Wang [Sun, 22 Aug 2010 00:00:59 +0000 (17:00 -0700)]
am
ad3cf5f8: Restore OTA for crespo. [DO NOT MERGE]
Merge commit '
ad3cf5f868fc36de0a4fa501f074d35a94496b27' into gingerbread-plus-aosp
* commit '
ad3cf5f868fc36de0a4fa501f074d35a94496b27':
Restore OTA for crespo. [DO NOT MERGE]
Ying Wang [Sat, 21 Aug 2010 23:49:07 +0000 (16:49 -0700)]
Restore OTA for crespo. [DO NOT MERGE]
Change-Id: I2472942741bdb2e4fa5037883f6acbe6c4ca36c3
Jean-Baptiste Queru [Sat, 21 Aug 2010 02:22:51 +0000 (19:22 -0700)]
am
60d1ee3e: Better way to disable OTAs for crespo - DO NOT MERGE
Merge commit '
60d1ee3e539e02ba701b9ff647fd23aca18f890d' into gingerbread-plus-aosp
* commit '
60d1ee3e539e02ba701b9ff647fd23aca18f890d':
Better way to disable OTAs for crespo - DO NOT MERGE
Jean-Baptiste Queru [Sat, 21 Aug 2010 02:19:00 +0000 (19:19 -0700)]
Better way to disable OTAs for crespo - DO NOT MERGE
OTAs need to be disabled for all products using crespo
hardware, not just a single one.
Change-Id: I961462e5e87bec8c59dafa13dbf0fdc96bab29ab
Ying Wang [Sat, 21 Aug 2010 00:13:56 +0000 (17:13 -0700)]
am
7daa9132: Disable OTA for crespo [DO NOT MERGE]
Merge commit '
7daa91323139fa7c0435a07b0e3fad6056d0954b' into gingerbread-plus-aosp
* commit '
7daa91323139fa7c0435a07b0e3fad6056d0954b':
Disable OTA for crespo [DO NOT MERGE]
Ying Wang [Fri, 20 Aug 2010 23:45:19 +0000 (16:45 -0700)]
Disable OTA for crespo [DO NOT MERGE]
Change-Id: I22c29226bb783fed34766e91d43edcf6e61a837f
android-build SharedAccount [Fri, 20 Aug 2010 16:21:16 +0000 (09:21 -0700)]
FRG51
Change-Id: Ifa272e3b63d85a5b25a43e3869fea4e62ea0d037
android-build SharedAccount [Fri, 20 Aug 2010 06:42:00 +0000 (23:42 -0700)]
am
ba509c8d: am
c434bbbb: am
817a8ac9: (-s ours) bump version from 2.2 to 2.2.1 for next froyo release
Merge commit '
ba509c8db0b00fdc9143459b0d9fefb2c25a5861'
* commit '
ba509c8db0b00fdc9143459b0d9fefb2c25a5861':
bump version from 2.2 to 2.2.1 for next froyo release
Ying Wang [Thu, 19 Aug 2010 03:32:28 +0000 (20:32 -0700)]
Merge "Fix dependency."
Ying Wang [Thu, 19 Aug 2010 03:30:52 +0000 (20:30 -0700)]
Fix dependency.
Compile renderscript before building the package-export.apk.
Change-Id: Ibb7a6f940816f5839b27af94ca9b3895a84ef2ed
Danica Chang [Wed, 18 Aug 2010 23:47:13 +0000 (16:47 -0700)]
Merge "adding network to prelink"
android-build SharedAccount [Wed, 18 Aug 2010 21:38:05 +0000 (14:38 -0700)]
FRG49
Change-Id: Ibf2fb1a5f077bda95006ffcccf3208ac53a4835d
android-build SharedAccount [Wed, 18 Aug 2010 20:38:19 +0000 (13:38 -0700)]
am
c434bbbb: am
817a8ac9: (-s ours) bump version from 2.2 to 2.2.1 for next froyo release
Merge commit '
c434bbbb2c8453f581e0b993ecf23949ca7c5f9b' into gingerbread-plus-aosp
* commit '
c434bbbb2c8453f581e0b993ecf23949ca7c5f9b':
bump version from 2.2 to 2.2.1 for next froyo release
android-build SharedAccount [Wed, 18 Aug 2010 15:45:04 +0000 (08:45 -0700)]
am
817a8ac9: (-s ours) bump version from 2.2 to 2.2.1 for next froyo release
Merge commit '
817a8ac99392228f894d18ea40b0fb4c1b6ca8fe' into gingerbread
* commit '
817a8ac99392228f894d18ea40b0fb4c1b6ca8fe':
bump version from 2.2 to 2.2.1 for next froyo release
android-build SharedAccount [Wed, 18 Aug 2010 05:44:17 +0000 (22:44 -0700)]
bump version from 2.2 to 2.2.1 for next froyo release
Change-Id: Ic636f111d4a7a69954539bbd480b7119bf0d730f
android-build SharedAccount [Wed, 18 Aug 2010 05:44:17 +0000 (22:44 -0700)]
bump version from 2.2 to 2.2.1 for next froyo release
Change-Id: Ic636f111d4a7a69954539bbd480b7119bf0d730f
Ben Dodson [Tue, 17 Aug 2010 21:40:42 +0000 (14:40 -0700)]
Merge "Synchronizing templates with doclava's external ones."
Ben Dodson [Tue, 17 Aug 2010 18:50:38 +0000 (11:50 -0700)]
Merge "Fix for building apicheck tool"
Ben Dodson [Tue, 17 Aug 2010 18:49:18 +0000 (11:49 -0700)]
Fix for building apicheck tool
Change-Id: If0dafa8e45de6a872bf1cc47942335493e96383b
Ben Dodson [Tue, 17 Aug 2010 18:31:33 +0000 (11:31 -0700)]
Merge "Removed unused source files. Apicheck and droiddoc are now in external/doclava."
Ben Dodson [Tue, 17 Aug 2010 16:52:09 +0000 (09:52 -0700)]
Removed unused source files. Apicheck and droiddoc are now in external/doclava.
Change-Id: I13bcdbd27214e15235fa9687b6f15f8853f5f448
OSDN Git Service
