OSDN Git Service
Jean-Baptiste Queru [Tue, 14 Sep 2010 21:08:00 +0000 (14:08 -0700)]
Revert "Explicitly manage fonts and ICU data"
This reverts commit
b315d46bc8c2126f090c77e07bba4d6062ebff05.
Jean-Baptiste Queru [Tue, 14 Sep 2010 20:28:05 +0000 (13:28 -0700)]
Merge "Revert "Default host module tag to optional.""
Jean-Baptiste Queru [Tue, 14 Sep 2010 20:27:12 +0000 (13:27 -0700)]
Revert "Default host module tag to optional."
This reverts commit
528362f07460cfee42190e68ee2ffde4f08f0af4.
Jean-Baptiste Queru [Tue, 14 Sep 2010 18:33:41 +0000 (11:33 -0700)]
Explicitly manage fonts and ICU data
Change-Id: If08edf37f06d9978326202797c52a0cae2f71d3e
Jean-Baptiste Queru [Tue, 14 Sep 2010 16:52:25 +0000 (09:52 -0700)]
merge
dd1d0016 to master
Change-Id: Ib83cd76a959fa6209f4920021d3dbf5d61fa6b8e
Ying Wang [Tue, 14 Sep 2010 16:43:01 +0000 (09:43 -0700)]
am
69de539a: Add host modules needed by SDK build.
Merge commit '
69de539a091bc035e0e2d67f2282450a6b4966bd' into gingerbread-plus-aosp
* commit '
69de539a091bc035e0e2d67f2282450a6b4966bd':
Add host modules needed by SDK build.
Ying Wang [Tue, 14 Sep 2010 01:11:11 +0000 (18:11 -0700)]
Add host modules needed by SDK build.
Since host module tag is defaulted to optional now, we have to explicitly
add those modules to the SDK product config file.
Change-Id: I8f6c4dcb17ef7716ae3590d6e96ddd5d07cc0582
Ying Wang [Tue, 14 Sep 2010 00:24:04 +0000 (17:24 -0700)]
am
74005c3c: am
528362f0: Default host module tag to optional.
Merge commit '
74005c3c2df04e035000426909a060f6149fd1d6'
* commit '
74005c3c2df04e035000426909a060f6149fd1d6':
Default host module tag to optional.
Dmitry Shmidt [Mon, 13 Sep 2010 23:58:03 +0000 (16:58 -0700)]
Merge "Add "ip" utility to all builds"
Dmitry Shmidt [Mon, 13 Sep 2010 23:54:37 +0000 (16:54 -0700)]
Add "ip" utility to all builds
Change-Id: Iad392d127bd7f6ee014710a9c7479e3aaa92e743
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Ying Wang [Mon, 13 Sep 2010 22:09:25 +0000 (15:09 -0700)]
am
528362f0: Default host module tag to optional.
Merge commit '
528362f07460cfee42190e68ee2ffde4f08f0af4' into gingerbread-plus-aosp
* commit '
528362f07460cfee42190e68ee2ffde4f08f0af4':
Default host module tag to optional.
Ying Wang [Mon, 13 Sep 2010 21:56:15 +0000 (14:56 -0700)]
Default host module tag to optional.
Change-Id: I8ae572b368e7ecdcc8e5bb257bb2f6084b5fb508
Doug Zongker [Mon, 13 Sep 2010 21:37:20 +0000 (14:37 -0700)]
resolved conflicts for merge of
8ae62ec7 to master
Change-Id: Ieb424d1a8467ca13dae43190387e1137c1e396c9
Doug Zongker [Mon, 13 Sep 2010 18:51:09 +0000 (11:51 -0700)]
am
ea5d7a9d: move File and Difference classes into common script
Merge commit '
ea5d7a9de7660bef5b9c68f6372a92d4b2f2f1f6' into gingerbread-plus-aosp
* commit '
ea5d7a9de7660bef5b9c68f6372a92d4b2f2f1f6':
move File and Difference classes into common script
Doug Zongker [Sun, 12 Sep 2010 22:26:16 +0000 (15:26 -0700)]
move File and Difference classes into common script
This makes them accessible from device-specific extensions (so they
can be used to send radio images as binary patches, for instance).
Change-Id: I2f2174b93b4265abf9400f9e5a0982caca0771e9
Ying Wang [Sat, 11 Sep 2010 01:52:51 +0000 (18:52 -0700)]
Ying Wang [Sat, 11 Sep 2010 01:49:47 +0000 (18:49 -0700)]
am
73ca57f5: Fix host-dexed libraries.
Merge commit '
73ca57f5e688280599f507c10ebaf702506cc799' into gingerbread-plus-aosp
* commit '
73ca57f5e688280599f507c10ebaf702506cc799':
Fix host-dexed libraries.
Ying Wang [Sat, 11 Sep 2010 01:38:10 +0000 (18:38 -0700)]
Fix host-dexed libraries.
With this change, host-dexed library A can have host-dexed library B in its LOCAL_JAVA_LIBRARIES.
Bug:
2992136
Change-Id: I794613d3230d4eb471a0566c325078da8fa38b86
Ying Wang [Sat, 11 Sep 2010 00:38:54 +0000 (17:38 -0700)]
resolved conflicts for merge of
31d4f53b to master
Change-Id: I87eff140bf68908d009e45687aff26f447a9b9b4
Ying Wang [Sat, 11 Sep 2010 00:21:33 +0000 (17:21 -0700)]
am
f7912e4e: Support to build host dex.
Merge commit '
f7912e4ee0ceb014117c66369485f0aa9ea7cf08' into gingerbread-plus-aosp
* commit '
f7912e4ee0ceb014117c66369485f0aa9ea7cf08':
Support to build host dex.
Gary King [Fri, 10 Sep 2010 23:21:56 +0000 (16:21 -0700)]
am
1c4f64b5: am
1e80c294: [build] move dumpvar.mk include after select.mk include
Merge commit '
1c4f64b59491eb8f3f7cb7b992a9fb06f2c475a1'
* commit '
1c4f64b59491eb8f3f7cb7b992a9fb06f2c475a1':
[build] move dumpvar.mk include after select.mk include
Ying Wang [Fri, 10 Sep 2010 23:19:38 +0000 (16:19 -0700)]
am
bcd1e1c8: am
570a0eef: Dist userdataimg and tests-zip-package for tests builds
Merge commit '
bcd1e1c8580213838b8ba415168065291019dcd4'
* commit '
bcd1e1c8580213838b8ba415168065291019dcd4':
Dist userdataimg and tests-zip-package for tests builds
Ying Wang [Fri, 10 Sep 2010 23:19:24 +0000 (16:19 -0700)]
Support to build host dex.
Change-Id: I55df5e4051dbeb89a70d6d7b89fb6110f133d9d7
Ying Wang [Fri, 10 Sep 2010 21:39:33 +0000 (14:39 -0700)]
Dist userdataimg and tests-zip-package for tests builds
So that the build server can run the following command to build and dist only the two packages:
make -j16 tests-zip-package userdataimage-nodeps dist showcommands TARGET_BUILD_VARIANT=tests TARGET_PRODUCT=passion
Change-Id: I03d7049582ec8537a389e80b7ecdcae6625222ea
Gary King [Fri, 10 Sep 2010 22:42:30 +0000 (15:42 -0700)]
am
1e80c294: [build] move dumpvar.mk include after select.mk include
Merge commit '
1e80c294ffef26a6a7fe435411cd7557003b1d3f' into gingerbread-plus-aosp
* commit '
1e80c294ffef26a6a7fe435411cd7557003b1d3f':
[build] move dumpvar.mk include after select.mk include
Jean-Baptiste Queru [Fri, 10 Sep 2010 21:52:25 +0000 (14:52 -0700)]
am
93847f53: am
cc84526b: Merge "Add atom optimization flags"
Merge commit '
93847f5355204635648d791098dd0210e22d53ab'
* commit '
93847f5355204635648d791098dd0210e22d53ab':
Add atom optimization flags
Ying Wang [Fri, 10 Sep 2010 21:46:01 +0000 (14:46 -0700)]
am
570a0eef: Dist userdataimg and tests-zip-package for tests builds
Merge commit '
570a0eeffb4c06084f21a058efb25271bb0cd1f6' into gingerbread-plus-aosp
* commit '
570a0eeffb4c06084f21a058efb25271bb0cd1f6':
Dist userdataimg and tests-zip-package for tests builds
Ying Wang [Fri, 10 Sep 2010 21:39:33 +0000 (14:39 -0700)]
Dist userdataimg and tests-zip-package for tests builds
So that the build server can run the following command to build and dist only the two packages:
make -j16 tests-zip-package userdataimage-nodeps dist showcommands TARGET_BUILD_VARIANT=tests TARGET_PRODUCT=passion
Change-Id: I03d7049582ec8537a389e80b7ecdcae6625222ea
Gary King [Tue, 9 Mar 2010 01:16:57 +0000 (17:16 -0800)]
[build] move dumpvar.mk include after select.mk include
because the dumpvar target was included early in envsetup.mk, it was
not possible to use it to dump variables that were defined by makefiles
included later (like the toolchain variables in combo/select.mk).
move dumpvar.mk to after select.mk and javac.mk, so that shell functions
can be created using the toolchain build variables
Change-Id: I1c22025a8981fa91c183846fb28be26fb562adfb
Signed-off-by: Gary King <gking@nvidia.com>
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:51:49 +0000 (15:51 -0700)]
Jean-Baptiste Queru [Wed, 8 Sep 2010 22:51:27 +0000 (15:51 -0700)]
am
e0cb0fd3: resolved conflicts for merge of
ba3ed0c7 to gingerbread-plus-aosp
Merge commit '
e0cb0fd3f5c9626d90ea6907e63530d8e05067f9'
* commit '
e0cb0fd3f5c9626d90ea6907e63530d8e05067f9':
a few more existing user modules to be grandfathered in - DO NOT MERGE
Jean-Baptiste Queru [Wed, 8 Sep 2010 22:51:24 +0000 (15:51 -0700)]
am
0dda5a19: (-s ours) a few more existing user modules to be grandfathered in - DO NOT MERGE
Merge commit '
0dda5a191df021a13c91d42109d55f4434b2c5da'
* commit '
0dda5a191df021a13c91d42109d55f4434b2c5da':
a few more existing user modules to be grandfathered in - DO NOT MERGE
Jean-Baptiste Queru [Wed, 8 Sep 2010 22:45:21 +0000 (15:45 -0700)]
more modules with user tags that need to br grandfathered in
Change-Id: Iad72076094d028499bac516271fd422c4b15cb92
Jean-Baptiste Queru [Wed, 8 Sep 2010 22:45:21 +0000 (15:45 -0700)]
one more module grandfathered with a user tag
Change-Id: I22d60c33df06cfe0bfd2041a611c762e6e662c94
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:38:06 +0000 (14:38 -0700)]
am
b81c3989: (-s ours) am
22e620c4: a few more existing user modules to be grandfathered in - DO NOT MERGE
Merge commit '
b81c3989cbb7c94e28d05434c434a62fbf029cb8'
* commit '
b81c3989cbb7c94e28d05434c434a62fbf029cb8':
a few more existing user modules to be grandfathered in - DO NOT MERGE
Dan Bornstein [Wed, 8 Sep 2010 21:38:03 +0000 (14:38 -0700)]
am
3177afa8: am
ca917dc2: Merge "Enable WITH_HOST_DALVIK for "user" builds on Linux." into gingerbread
Merge commit '
3177afa8177d8b31dd6bd160816a11fedeec7e07'
* commit '
3177afa8177d8b31dd6bd160816a11fedeec7e07':
Enable WITH_HOST_DALVIK for "user" builds on Linux.
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
Jean-Baptiste Queru [Wed, 8 Sep 2010 21:08:45 +0000 (14:08 -0700)]
Merge "Warn when new modules are found that use user tags"
Jean-Baptiste Queru [Wed, 8 Sep 2010 20:14:04 +0000 (13:14 -0700)]
am
130b539b: (-s ours) am
890ef4b0: a few more existing user modules to be grandfathered in - DO NOT MERGE
Merge commit '
130b539bfdda612dd3858b407c503c3e80d9aa72'
* commit '
130b539bfdda612dd3858b407c503c3e80d9aa72':
a few more existing user modules to be grandfathered in - DO NOT MERGE
Jean-Baptiste Queru [Wed, 8 Sep 2010 20:13:58 +0000 (13:13 -0700)]
am
78a59022: (-s ours) a few more grandfathered user tags - DO NOT MERGE
Merge commit '
78a59022f89a65f5e7107d57f4995c1eb70e1fb2'
* commit '
78a59022f89a65f5e7107d57f4995c1eb70e1fb2':
a few more grandfathered user tags - DO NOT MERGE
Jean-Baptiste Queru [Fri, 3 Sep 2010 23:32:58 +0000 (16:32 -0700)]
Warn when new modules are found that use user tags
Change-Id: I49369cc1596f269e0964f0a6a88bcc7152209bde
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
Jeff Hamilton [Wed, 8 Sep 2010 19:31:10 +0000 (12:31 -0700)]
Merge "Add more cleanspecs for the property files, fixing ro.secure."
Jeff Hamilton [Wed, 8 Sep 2010 19:26:13 +0000 (14:26 -0500)]
Add more cleanspecs for the property files, fixing ro.secure.
Change-Id: Iae47959c25ca9779df7679528d1d61ebd3c48b50
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:38:19 +0000 (10:38 -0700)]
am
6b747cfb: (-s ours) am
a90f9d2c: Merge "Warn when new modules are found that use user tags - DO NOT MERGE" into gingerbread
Merge commit '
6b747cfb21e270598c0d1bf1923c4da768a676a8'
* commit '
6b747cfb21e270598c0d1bf1923c4da768a676a8':
Warn when new modules are found that use user tags - DO NOT MERGE
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:56:45 +0000 (11:56 -0700)]
am
49da72c2: am
dff3c597: cleanspec for corrupted build.prop
Merge commit '
49da72c25abeb36fc5d9a1c786ee3f232cfc7682'
* commit '
49da72c25abeb36fc5d9a1c786ee3f232cfc7682':
cleanspec for corrupted build.prop
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:56:53 +0000 (10:56 -0700)]
am
8f731bb2: am
0545c916: Revert "Allow properties with spaces in their values"
Merge commit '
8f731bb2720475f652cc8c5849d564246b234bef'
* commit '
8f731bb2720475f652cc8c5849d564246b234bef':
Revert "Allow properties with spaces in their values"
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:32:32 +0000 (10:32 -0700)]
am
30d68a3b: (-s ours) am
817f07ae: Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE
Merge commit '
30d68a3b9df5657ca0eefb063551202490a836fb'
* commit '
30d68a3b9df5657ca0eefb063551202490a836fb':
Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE
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
Ying Wang [Tue, 7 Sep 2010 17:20:19 +0000 (10:20 -0700)]
Merge "Fix the unstripped path if LOCAL_MODULE_PATH is set."
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
Ying Wang [Fri, 3 Sep 2010 23:22:47 +0000 (16:22 -0700)]
Fix the unstripped path if LOCAL_MODULE_PATH is set.
Bug:
2953067
Change-Id: I12a0bdb1f3df4fa98bea70f60e0ce26bf863c924
Doug Zongker [Fri, 3 Sep 2010 21:35:49 +0000 (14:35 -0700)]
am
9314823c: am
93d574f8: Merge "return to using subprocess for running commands" into gingerbread
Merge commit '
9314823c06d4434bf18d589c2fdea490428becf8'
* commit '
9314823c06d4434bf18d589c2fdea490428becf8':
return to using subprocess for running commands
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 20:22:38 +0000 (13:22 -0700)]
resolved conflicts for merge of
a4a50996 to master
Change-Id: I52c617ff43aaf9e86b8fb7a2e9c305127566971a
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:36:46 +0000 (10:36 -0700)]
am
4b1e2245: am
c5b8d4ce: Merge "The old clean target had bit rotted." into gingerbread
Merge commit '
4b1e2245857d696aa0dfcd7a163c6d04025c74f6'
* commit '
4b1e2245857d696aa0dfcd7a163c6d04025c74f6':
The old clean target had bit rotted.
Ying Wang [Fri, 3 Sep 2010 17:36:41 +0000 (10:36 -0700)]
am
a79db6e4: am
3dae0ee4: Fix inherited dependency when instrmentation.
Merge commit '
a79db6e47a378cb089021a56637a9c6925f14261'
* commit '
a79db6e47a378cb089021a56637a9c6925f14261':
Fix inherited dependency when instrmentation.
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:15:29 +0000 (17:15 -0700)]
am
54b8b436: am
de3bfade: Allow properties with spaces in their values
Merge commit '
54b8b436a380b053772110796642c7e5e6ba8e64'
* commit '
54b8b436a380b053772110796642c7e5e6ba8e64':
Allow properties with spaces in their values
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 17:52:32 +0000 (10:52 -0700)]
am
dda34f53: am
42f40659: Merge "Disable new longjmp in glibc 2.11 and later."
Merge commit '
dda34f535d01518e44564a9cde525b768042cf90'
* commit '
dda34f535d01518e44564a9cde525b768042cf90':
Disable new longjmp in glibc 2.11 and later.
Ying Wang [Thu, 2 Sep 2010 17:52:29 +0000 (10:52 -0700)]
am
2e1347c6: am
fb644881: Disable new longjmp in glibc 2.11 and later.
Merge commit '
2e1347c6a010c51c9ec80fd312465c1c23666ab2'
* commit '
2e1347c6a010c51c9ec80fd312465c1c23666ab2':
Disable new longjmp in glibc 2.11 and later.
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
Ying Wang [Wed, 1 Sep 2010 21:47:54 +0000 (14:47 -0700)]
Merge "Now slang supports "-I" options."
Ying Wang [Wed, 1 Sep 2010 20:28:52 +0000 (13:28 -0700)]
Now slang supports "-I" options.
Change-Id: I32aef6c913d9d30f9982a593397145f1562aecf9
Joe Onorato [Wed, 1 Sep 2010 17:39:50 +0000 (10:39 -0700)]
Make it so if you say LOCAL_UNINSTALLABLE_MODULE := true for a docs build, it won't try to dist it.
Change-Id: Iff8a7b6438d392c5b4c425337b84cfa9bc90f282
Jean-Baptiste Queru [Wed, 1 Sep 2010 13:33:19 +0000 (06:33 -0700)]
manual merge
Change-Id: Iafb6e494f28050c960185656d4d630a6c27b6efe