OSDN Git Service
Jean-Baptiste Queru [Fri, 10 Sep 2010 20:03:13 +0000 (13:03 -0700)]
am
cc84526b: Merge "Add atom optimization flags"
Merge commit '
cc84526bcef5ffd7ed9abf73dc3bfc9e29784b22' into gingerbread-plus-aosp
* commit '
cc84526bcef5ffd7ed9abf73dc3bfc9e29784b22':
Add atom optimization flags
Jean-Baptiste Queru [Thu, 9 Sep 2010 21:07:21 +0000 (14:07 -0700)]
Merge "Add atom optimization flags"
Jean-Baptiste Queru [Wed, 8 Sep 2010 22:31:52 +0000 (15:31 -0700)]
Jean-Baptiste Queru [Wed, 8 Sep 2010 22:28:41 +0000 (15:28 -0700)]
fix typo
Change-Id: If4acf972380a94b160a656f849c4106025d3e6b2
Jean-Baptiste Queru [Wed, 8 Sep 2010 22:24:06 +0000 (15:24 -0700)]
resolved conflicts for merge of
ba3ed0c7 to gingerbread-plus-aosp
Change-Id: I68ff2cd2350721b43b6620c763cfbac5f6805beb
Jean-Baptiste Queru [Wed, 8 Sep 2010 19:18:04 +0000 (12:18 -0700)]
a few more existing user modules to be grandfathered in - DO NOT MERGE
Change-Id: I6a2337bb557735276c93c306caac43a59abff47c
Jean-Baptiste Queru [Wed, 8 Sep 2010 19:18:04 +0000 (12:18 -0700)]
a few more existing user modules to be grandfathered in - DO NOT MERGE
Change-Id: Ie50faf26b5db9ac3c46f50da8c48c6132d4f2d1b
Jean-Baptiste Queru [Wed, 8 Sep 2010 21:34:47 +0000 (14:34 -0700)]
am
22e620c4: a few more existing user modules to be grandfathered in - DO NOT MERGE
Merge commit '
22e620c4bed8c60361c02820cda4dfaafe83ebe5' into gingerbread-plus-aosp
* commit '
22e620c4bed8c60361c02820cda4dfaafe83ebe5':
a few more existing user modules to be grandfathered in - DO NOT MERGE
Dan Bornstein [Wed, 8 Sep 2010 21:34:21 +0000 (14:34 -0700)]
am
ca917dc2: Merge "Enable WITH_HOST_DALVIK for "user" builds on Linux." into gingerbread
Merge commit '
ca917dc2b2140b9fc4e331f94907cd27c8b6a91f' into gingerbread-plus-aosp
* commit '
ca917dc2b2140b9fc4e331f94907cd27c8b6a91f':
Enable WITH_HOST_DALVIK for "user" builds on Linux.
Jean-Baptiste Queru [Wed, 8 Sep 2010 19:18:04 +0000 (12:18 -0700)]
a few more existing user modules to be grandfathered in - DO NOT MERGE
Change-Id: I5f4c9f9ac948c2ba6865eae7dca2c0ed4d10702b
Dan Bornstein [Wed, 8 Sep 2010 19:37:11 +0000 (12:37 -0700)]
Merge "Enable WITH_HOST_DALVIK for "user" builds on Linux." into gingerbread
Jean-Baptiste Queru [Wed, 8 Sep 2010 19:21:43 +0000 (12:21 -0700)]
am
890ef4b0: a few more existing user modules to be grandfathered in - DO NOT MERGE
Merge commit '
890ef4b0aaa602b3f7bcee87bb4d89e6aaa53b48' into gingerbread-plus-aosp
* commit '
890ef4b0aaa602b3f7bcee87bb4d89e6aaa53b48':
a few more existing user modules to be grandfathered in - DO NOT MERGE
Jean-Baptiste Queru [Wed, 8 Sep 2010 19:18:04 +0000 (12:18 -0700)]
a few more existing user modules to be grandfathered in - DO NOT MERGE
Change-Id: I7526ad40f27853a2f83bc0c4c4f80ff709fcaf40
Jean-Baptiste Queru [Wed, 8 Sep 2010 19:11:54 +0000 (12:11 -0700)]
a few more grandfathered user tags - DO NOT MERGE
Change-Id: Ia625817d3f332f8760835b3fa20e56c00c305166
Dan Bornstein [Wed, 8 Sep 2010 00:45:44 +0000 (17:45 -0700)]
Enable WITH_HOST_DALVIK for "user" builds on Linux.
Bug:
2497274
Change-Id: I636895b52c82f301f8c288ae670b34e1dbf32cc5
Jean-Baptiste Queru [Wed, 8 Sep 2010 17:32:52 +0000 (10:32 -0700)]
am
a90f9d2c: Merge "Warn when new modules are found that use user tags - DO NOT MERGE" into gingerbread
Merge commit '
a90f9d2c299d7833b37f8a0e244a2893054d9ea5' into gingerbread-plus-aosp
* commit '
a90f9d2c299d7833b37f8a0e244a2893054d9ea5':
Warn when new modules are found that use user tags - DO NOT MERGE
Jean-Baptiste Queru [Wed, 8 Sep 2010 17:22:48 +0000 (10:22 -0700)]
Merge "Warn when new modules are found that use user tags - DO NOT MERGE" into gingerbread
Jean-Baptiste Queru [Tue, 7 Sep 2010 18:21:26 +0000 (11:21 -0700)]
am
dff3c597: cleanspec for corrupted build.prop
Merge commit '
dff3c59702392c2ed37b26b115c5cd0ed0498903' into gingerbread-plus-aosp
* commit '
dff3c59702392c2ed37b26b115c5cd0ed0498903':
cleanspec for corrupted build.prop
Jean-Baptiste Queru [Tue, 7 Sep 2010 18:18:09 +0000 (11:18 -0700)]
cleanspec for corrupted build.prop
Change-Id: Ib8d6719af92759272ae25607862391647dfe408d
Jean-Baptiste Queru [Tue, 7 Sep 2010 17:53:46 +0000 (10:53 -0700)]
am
0545c916: Revert "Allow properties with spaces in their values"
Merge commit '
0545c9160d0d3dde4675184609cc7656de5558b0' into gingerbread-plus-aosp
* commit '
0545c9160d0d3dde4675184609cc7656de5558b0':
Revert "Allow properties with spaces in their values"
Jean-Baptiste Queru [Tue, 7 Sep 2010 17:51:12 +0000 (10:51 -0700)]
Revert "Allow properties with spaces in their values"
This reverts commit
de3bfade571033b01fbaccac2f0fdf7193e8d3ee.
Ying Wang [Tue, 7 Sep 2010 17:29:34 +0000 (10:29 -0700)]
am
817f07ae: Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE
Merge commit '
817f07aef008dd3f32fed3603382123917fdec64' into gingerbread-plus-aosp
* commit '
817f07aef008dd3f32fed3603382123917fdec64':
Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE
Ying Wang [Tue, 7 Sep 2010 17:26:18 +0000 (10:26 -0700)]
Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE
Cherry-pick from master.
Change-Id: I0a56e3e91efd53ad2671136b6fe00ee675f56230
Jean-Baptiste Queru [Fri, 3 Sep 2010 23:32:58 +0000 (16:32 -0700)]
Warn when new modules are found that use user tags - DO NOT MERGE
Change-Id: Ia563765f3d0161d7c851a0162d65c2a249b4dd38
Doug Zongker [Fri, 3 Sep 2010 21:33:22 +0000 (14:33 -0700)]
am
93d574f8: Merge "return to using subprocess for running commands" into gingerbread
Merge commit '
93d574f8c57b85e1de9fea2c7e868ac8ea56e2b9' into gingerbread-plus-aosp
* commit '
93d574f8c57b85e1de9fea2c7e868ac8ea56e2b9':
return to using subprocess for running commands
Doug Zongker [Fri, 3 Sep 2010 21:31:03 +0000 (14:31 -0700)]
Merge "return to using subprocess for running commands" into gingerbread
Doug Zongker [Fri, 3 Sep 2010 21:15:34 +0000 (14:15 -0700)]
return to using subprocess for running commands
Reverts Ic4f1c747 and fixes the problem by splitting the extra_flags
argument (it wasn't working before because it was getting one argument
"-c 4096 -s 128" instead of four arguments "-c", "4096", "-s", "128"
and mkyaffs2image apparently just ignores that bogus argument?)
Change-Id: Ib1e08d634aa68bfab0f7e09680d407f2cee0797d
Doug Zongker [Fri, 3 Sep 2010 19:39:15 +0000 (12:39 -0700)]
am
c637db16: remove remaining amend support
Merge commit '
c637db16d83b2c248b1cf0122e2ba558ed95762c' into gingerbread-plus-aosp
* commit '
c637db16d83b2c248b1cf0122e2ba558ed95762c':
remove remaining amend support
Doug Zongker [Wed, 21 Apr 2010 21:08:44 +0000 (14:08 -0700)]
remove remaining amend support
Remove the remaining (unused and untested) support for generating
amend scripts. This means that you won't be able to OTA directly from
cupcake to gingerbread.
Change-Id: Iaf5295db92a42b336960d05295f48b67cb729337
Joe Onorato [Fri, 3 Sep 2010 17:28:00 +0000 (10:28 -0700)]
am
c5b8d4ce: Merge "The old clean target had bit rotted." into gingerbread
Merge commit '
c5b8d4ceb63909e5f0811fa80dca205996fd8644' into gingerbread-plus-aosp
* commit '
c5b8d4ceb63909e5f0811fa80dca205996fd8644':
The old clean target had bit rotted.
Joe Onorato [Fri, 3 Sep 2010 17:26:04 +0000 (10:26 -0700)]
Merge "The old clean target had bit rotted." into gingerbread
Joe Onorato [Fri, 3 Sep 2010 17:25:11 +0000 (13:25 -0400)]
The old clean target had bit rotted.
Clean and clobber are now the same thing.
Change-Id: I4873d40496b16e13689e22c48cff1fecdffb8b40
Ying Wang [Fri, 3 Sep 2010 17:21:37 +0000 (10:21 -0700)]
am
3dae0ee4: Fix inherited dependency when instrmentation.
Merge commit '
3dae0ee46cf5fcde6eb424f9ab0c69f2d901a671' into gingerbread-plus-aosp
* commit '
3dae0ee46cf5fcde6eb424f9ab0c69f2d901a671':
Fix inherited dependency when instrmentation.
Ying Wang [Thu, 2 Sep 2010 22:41:01 +0000 (15:41 -0700)]
Fix inherited dependency when instrmentation.
It turns out we should also LOCAL_INSTRUMENTATION_FOR.
To disambiguate LOCAL_INSTRUMENTATION_FOR_PACKAGE_NAME is renamed to LOCAL_MANIFEST_INSTRUMENTATION_FOR.
Bug:
2902591
Change-Id: I6cb893c135736fc4170aa2259105b4c5eea798a1
Jean-Baptiste Queru [Fri, 3 Sep 2010 00:13:24 +0000 (17:13 -0700)]
am
de3bfade: Allow properties with spaces in their values
Merge commit '
de3bfade571033b01fbaccac2f0fdf7193e8d3ee' into gingerbread-plus-aosp
* commit '
de3bfade571033b01fbaccac2f0fdf7193e8d3ee':
Allow properties with spaces in their values
Jean-Baptiste Queru [Thu, 2 Sep 2010 21:30:56 +0000 (14:30 -0700)]
Allow properties with spaces in their values
This way, such properties can be set in product definition files
instead of having to live in system.prop, which eliminates the need
for system.prop
Change-Id: I25d9665f65436df8215940e46380deb31b8161ba
Ying Wang [Thu, 2 Sep 2010 16:58:58 +0000 (09:58 -0700)]
am
42f40659: Merge "Disable new longjmp in glibc 2.11 and later."
Merge commit '
42f406593e7fb1124e6aa00cc060e421d5a53554' into gingerbread-plus-aosp
* commit '
42f406593e7fb1124e6aa00cc060e421d5a53554':
Disable new longjmp in glibc 2.11 and later.
Ying Wang [Thu, 2 Sep 2010 16:45:11 +0000 (09:45 -0700)]
am
fb644881: Disable new longjmp in glibc 2.11 and later.
Merge commit '
fb644881b6083aa0d9d15e7aad8bfa5a429b1c37' into gingerbread-plus-aosp
* commit '
fb644881b6083aa0d9d15e7aad8bfa5a429b1c37':
Disable new longjmp in glibc 2.11 and later.
Ying Wang [Thu, 2 Sep 2010 16:44:39 +0000 (09:44 -0700)]
Merge "Disable new longjmp in glibc 2.11 and later."
Ying Wang [Wed, 1 Sep 2010 23:56:25 +0000 (16:56 -0700)]
Disable new longjmp in glibc 2.11 and later.
Bug:
2967937
Change-Id: I7a5ef082502192f41c26a48632edfe775dea7648
Ying Wang [Wed, 1 Sep 2010 23:39:11 +0000 (16:39 -0700)]
Disable new longjmp in glibc 2.11 and later.
Bug:
2967937
Change-Id: I4e2a5f806ad45a01ca7f8c4d032cd29fce1d794d
Jean-Baptiste Queru [Wed, 1 Sep 2010 13:23:50 +0000 (06:23 -0700)]
am
85fd5030: Revert "Fixed problem with keymap files copied to target"
Merge commit '
85fd5030b11d412f345b0ed039aa9912c7973aea' into gingerbread-plus-aosp
* commit '
85fd5030b11d412f345b0ed039aa9912c7973aea':
Revert "Fixed problem with keymap files copied to target"
Jean-Baptiste Queru [Wed, 1 Sep 2010 13:10:40 +0000 (06:10 -0700)]
Revert "Fixed problem with keymap files copied to target"
This reverts commit
c90449f2a88ceb44db5333b5442fc00fa4d0e4dd.
Jean-Baptiste Queru [Tue, 31 Aug 2010 22:04:01 +0000 (15:04 -0700)]
am
a160e316: Merge "Fixed problem with keymap files copied to target"
Merge commit '
a160e3169e6624610fd05b2edd14b674ffb54e44' into gingerbread-plus-aosp
* commit '
a160e3169e6624610fd05b2edd14b674ffb54e44':
Fixed problem with keymap files copied to target
Jean-Baptiste Queru [Tue, 31 Aug 2010 21:52:54 +0000 (14:52 -0700)]
Merge "Fixed problem with keymap files copied to target"
Joe Onorato [Tue, 31 Aug 2010 20:00:56 +0000 (13:00 -0700)]
am
cd7c775e: fix the build still
Merge commit '
cd7c775ece6854765ae3208818e76d9d11724713' into gingerbread-plus-aosp
* commit '
cd7c775ece6854765ae3208818e76d9d11724713':
fix the build still
Joe Onorato [Tue, 31 Aug 2010 19:56:49 +0000 (12:56 -0700)]
fix the build still
Change-Id: I2bfbcdd4b463549f3f331ac7a1c7fa89aadef1a8
Joe Onorato [Tue, 31 Aug 2010 19:12:17 +0000 (12:12 -0700)]
am
0ee89a72: DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Merge commit '
0ee89a72d50ff4bc5c7d2a285cd799d3a8b48efb' into gingerbread-plus-aosp
* commit '
0ee89a72d50ff4bc5c7d2a285cd799d3a8b48efb':
DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Joe Onorato [Tue, 31 Aug 2010 18:27:25 +0000 (11:27 -0700)]
DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Change-Id: I886448a3126b81c19342d920669e050eb5ef20eb
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: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
Magnus Karlsson [Mon, 30 Aug 2010 14:51:28 +0000 (16:51 +0200)]
Fixed problem with keymap files copied to target
Moved Android.mk and keymap files except AVRCP.kl from sdk/emulator/keymaps
to build/target/board/generic. This causes the keymap files to copied into
the system image of generic and sdk products, but not into the system image
of HW products. Originally the qwerty.kl was copied to target no matter
if the target had a qwerty keyboard or not, which is the case for e.g.
the Nexus One.
Change-Id: I7cd80497632fb3b9e7ce2f3a7888d4924a355f52
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 [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
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
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: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: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: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: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: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
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
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:18:07 +0000 (11:18 -0700)]
Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
Original CL: 59920
Change-Id: I81437996670a61e10284293d25a08da8907ad296
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 [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