OSDN Git Service
Joe Onorato [Thu, 16 Sep 2010 16:27:31 +0000 (09:27 -0700)]
am
25ab3dcc: Merge "DO NOT MERGE - Add a -knowntags option to droiddoc" into gingerbread
Merge commit '
25ab3dcce40bc2d19eeb99c7b36eeab52e4fa582' into gingerbread-plus-aosp
* commit '
25ab3dcce40bc2d19eeb99c7b36eeab52e4fa582':
DO NOT MERGE - Add a -knowntags option to droiddoc
Joe Onorato [Thu, 16 Sep 2010 16:27:24 +0000 (09:27 -0700)]
am
9e59ec29: Merge "Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules." into gingerbread
Merge commit '
9e59ec29933a4e6e9ee740fd180e4e31ff687fae' into gingerbread-plus-aosp
* commit '
9e59ec29933a4e6e9ee740fd180e4e31ff687fae':
Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules.
Joe Onorato [Thu, 16 Sep 2010 16:02:54 +0000 (09:02 -0700)]
Merge "DO NOT MERGE - Add a -knowntags option to droiddoc" into gingerbread
Joe Onorato [Thu, 16 Sep 2010 16:02:17 +0000 (09:02 -0700)]
Merge "Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules." into gingerbread
Joe Onorato [Thu, 16 Sep 2010 15:57:42 +0000 (11:57 -0400)]
DO NOT MERGE - Add a -knowntags option to droiddoc
This lets us remove the special cases in Comment.java and specify additional
tags to not warn about for the big docs build.
Change-Id: I25ad651616f162919c56daa2d4bdf6333c9dd87d
Joe Onorato [Thu, 16 Sep 2010 15:57:19 +0000 (11:57 -0400)]
Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules.
Change-Id: I568b416efe5ccefac6b5e6e99ddccc23600b1f74
Jean-Baptiste Queru [Thu, 16 Sep 2010 03:05:41 +0000 (20:05 -0700)]
am
da21ccf8: Grandfather the simulator-specific modules. do not merge.
Merge commit '
da21ccf86c31fb060b5a259342fb0bfbb0362f8b' into gingerbread-plus-aosp
* commit '
da21ccf86c31fb060b5a259342fb0bfbb0362f8b':
Grandfather the simulator-specific modules. do not merge.
Jean-Baptiste Queru [Thu, 16 Sep 2010 02:51:50 +0000 (19:51 -0700)]
Grandfather the simulator-specific modules. do not merge.
Those aren't new modules that were added recently, they just never got
considered when generating the original list of grandfathered modules
Change-Id: I0e6ff940936454048b59c0fc38e24e533e8598ae
Jean-Baptiste Queru [Wed, 15 Sep 2010 21:42:46 +0000 (14:42 -0700)]
am
5890600d: Add a better explanation about how to deal with user modules
Merge commit '
5890600dac385941b6a4c6b6d0b230c1f13d54fa' into gingerbread-plus-aosp
* commit '
5890600dac385941b6a4c6b6d0b230c1f13d54fa':
Add a better explanation about how to deal with user modules
Jean-Baptiste Queru [Wed, 15 Sep 2010 20:59:29 +0000 (13:59 -0700)]
Add a better explanation about how to deal with user modules
Change-Id: Ib79cc0f4b47648daa18db97aa949cd167c8d44a9
Doug Zongker [Wed, 15 Sep 2010 20:14:26 +0000 (13:14 -0700)]
am
135a120e: remove the system board name from the build fingerprint
Merge commit '
135a120e3904d782623e4a3fc958ed098e8de384' into gingerbread-plus-aosp
* commit '
135a120e3904d782623e4a3fc958ed098e8de384':
remove the system board name from the build fingerprint
Doug Zongker [Wed, 15 Sep 2010 20:02:12 +0000 (13:02 -0700)]
remove the system board name from the build fingerprint
Change-Id: I4cbbd03084b6ac24184b7475be3d34130094667d
Jean-Baptiste Queru [Wed, 15 Sep 2010 19:56:42 +0000 (12:56 -0700)]
am
85f351d1: Merge "Allow devices without AndroidBoard.mk" into gingerbread
Merge commit '
85f351d1f925b265c401f1992b57dc028d462453' into gingerbread-plus-aosp
* commit '
85f351d1f925b265c401f1992b57dc028d462453':
Allow devices without AndroidBoard.mk
Jean-Baptiste Queru [Wed, 15 Sep 2010 19:54:56 +0000 (12:54 -0700)]
Merge "Allow devices without AndroidBoard.mk" into gingerbread
Jean-Baptiste Queru [Wed, 15 Sep 2010 18:59:33 +0000 (11:59 -0700)]
Allow devices without AndroidBoard.mk
A long time ago, Android.mk in devices had the same semantics
as the current AndroidBoard.mk. This eventually caused problems
(as it didn't allow having a true Android.mk there) so we switched,
and left an error behind in case people were still using the old
semantics (i.e. having an Android.mk but no AndroidBoard.mk).
Fast forward a few years to the present: we're finding that we want
to get rid of AndroidBoard.mk, so there are devices that will have
Android.mk but not AndroidBoard.mk. As this is becoming a legitimate
case, the error for it is removed, and the include for AndroidBoard.mk
is made optional.
Change-Id: Ic683419d4aaab122259715e0112660d2a6359e91
Ying Wang [Wed, 15 Sep 2010 18:58:41 +0000 (11:58 -0700)]
am
659adc0b: Merge "Change "make PRODUCT-XXX-tests" to build only tests-build-target" into gingerbread
Merge commit '
659adc0b54e40b3b194c84ad4ac8d2e775276e60' into gingerbread-plus-aosp
* commit '
659adc0b54e40b3b194c84ad4ac8d2e775276e60':
Change "make PRODUCT-XXX-tests" to build only tests-build-target
Ying Wang [Wed, 15 Sep 2010 18:52:34 +0000 (11:52 -0700)]
Merge "Change "make PRODUCT-XXX-tests" to build only tests-build-target" into gingerbread
Jean-Baptiste Queru [Wed, 15 Sep 2010 16:48:01 +0000 (09:48 -0700)]
am
78c5ff6d: another module that needs to be grandfathered in
Merge commit '
78c5ff6d376afc6a1a5fab8a7a24be00211c2d35' into gingerbread-plus-aosp
* commit '
78c5ff6d376afc6a1a5fab8a7a24be00211c2d35':
another module that needs to be grandfathered in
Jean-Baptiste Queru [Wed, 15 Sep 2010 15:06:05 +0000 (08:06 -0700)]
another module that needs to be grandfathered in
Change-Id: I37e0e0ae0056a2315e1102f79fd923143928f6fe
Jean-Baptiste Queru [Wed, 15 Sep 2010 16:25:36 +0000 (09:25 -0700)]
am
0dfcdcb8: another module that needs to be grandfathered in
Merge commit '
0dfcdcb8b4e76ab1ae3f9086e59b5d30e42b8394' into gingerbread-plus-aosp
* commit '
0dfcdcb8b4e76ab1ae3f9086e59b5d30e42b8394':
another module that needs to be grandfathered in
Jean-Baptiste Queru [Wed, 15 Sep 2010 15:06:05 +0000 (08:06 -0700)]
another module that needs to be grandfathered in
Change-Id: Ibf24b4507b0c367117c33476a07d7189aeb3dff7
Jean-Baptiste Queru [Wed, 15 Sep 2010 15:16:34 +0000 (08:16 -0700)]
am
6dc2a832: another module that needs to be grandfathered in
Merge commit '
6dc2a832508c08c12cb30a6bc2beb8101107cc68' into gingerbread-plus-aosp
* commit '
6dc2a832508c08c12cb30a6bc2beb8101107cc68':
another module that needs to be grandfathered in
Jean-Baptiste Queru [Wed, 15 Sep 2010 15:06:05 +0000 (08:06 -0700)]
another module that needs to be grandfathered in
Change-Id: I024ba177e6ca4745e38feb2395e57c46354c2eea
Ying Wang [Tue, 14 Sep 2010 23:07:56 +0000 (16:07 -0700)]
Change "make PRODUCT-XXX-tests" to build only tests-build-target
Change-Id: Ib1a1a7b09ea6f1c3eea84394dcd6e3ebcda81e1a
Jean-Baptiste Queru [Tue, 14 Sep 2010 20:27:46 +0000 (13:27 -0700)]
am
32afccc7: Revert "Default host module tag to optional."
Merge commit '
32afccc732a6d7c631d2ba4d8a818fcbe2162903' into gingerbread-plus-aosp
* commit '
32afccc732a6d7c631d2ba4d8a818fcbe2162903':
Revert "Default host module tag to optional."
Jean-Baptiste Queru [Tue, 14 Sep 2010 20:25:42 +0000 (13:25 -0700)]
Revert "Default host module tag to optional."
This reverts commit
528362f07460cfee42190e68ee2ffde4f08f0af4.
Jean-Baptiste Queru [Tue, 14 Sep 2010 16:44:07 +0000 (09:44 -0700)]
am
6e8b268d: Fail the build when using a user tag on a non-legacy module. do not merge
Merge commit '
6e8b268dec3cc38151dfd0514621219b79a30fa9' into gingerbread-plus-aosp
* commit '
6e8b268dec3cc38151dfd0514621219b79a30fa9':
Fail the build when using a user tag on a non-legacy module. do not merge
Ying Wang [Tue, 14 Sep 2010 16:43:03 +0000 (09:43 -0700)]
am
b125c81c: Refine the comment.
Merge commit '
b125c81cfcf9aea02c05f292c9eceb4e0bd66c87' into gingerbread-plus-aosp
* commit '
b125c81cfcf9aea02c05f292c9eceb4e0bd66c87':
Refine the comment.
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.
Jean-Baptiste Queru [Tue, 14 Sep 2010 15:59:21 +0000 (08:59 -0700)]
Fail the build when using a user tag on a non-legacy module. do not merge
The supported mechanism is to explicitly add the module
name to the PRODUCT_PACKAGES of the relevant product definitions.
Change-Id: I67bef9a967576b77a5d6c298178f03c66722eb37
Ying Wang [Tue, 14 Sep 2010 01:33:31 +0000 (18:33 -0700)]
Refine the comment.
The host tools include script as well as native binaries.
Change-Id: I8bdd62bf5117ac71e2607d2cb4cd7b08bcbe7b14
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 [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 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: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: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.
Ying Wang [Fri, 10 Sep 2010 23:19:24 +0000 (16:19 -0700)]
Support to build host dex.
Change-Id: I55df5e4051dbeb89a70d6d7b89fb6110f133d9d7
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
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: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
OSDN Git Service
