OSDN Git Service
Joe Onorato [Thu, 16 Sep 2010 18:35:31 +0000 (11:35 -0700)]
am
61f23925: (-s ours) am
6022a978: Merge "DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off." into gingerbread
Merge commit '
61f23925d2d0b27ad5a62587c0f9d5e4a6040acc'
* commit '
61f23925d2d0b27ad5a62587c0f9d5e4a6040acc':
DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off.
Ying Wang [Thu, 16 Sep 2010 18:32:20 +0000 (11:32 -0700)]
am
acff3464: (-s ours) am
671f5fb0: Don\'t increase partition size for ext4 user images. [DO NOT MERGE]
Merge commit '
acff3464f84d0eaca8d167c4a9daddf4fc7ca8d2'
* commit '
acff3464f84d0eaca8d167c4a9daddf4fc7ca8d2':
Don't increase partition size for ext4 user images. [DO NOT MERGE]
Joe Onorato [Thu, 16 Sep 2010 18:22:22 +0000 (11:22 -0700)]
am
6022a978: Merge "DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off." into gingerbread
Merge commit '
6022a9786f745dc41f92e71e16b5b95a7cfd81b7' into gingerbread-plus-aosp
* commit '
6022a9786f745dc41f92e71e16b5b95a7cfd81b7':
DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off.
Joe Onorato [Thu, 16 Sep 2010 18:17:37 +0000 (11:17 -0700)]
Merge "DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off." into gingerbread
Joe Onorato [Thu, 16 Sep 2010 18:16:51 +0000 (14:16 -0400)]
DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off.
Change-Id: I94652bad7084f3868049b4ea0e43bb90f86dba6f
Ying Wang [Thu, 16 Sep 2010 17:59:41 +0000 (10:59 -0700)]
am
671f5fb0: Don\'t increase partition size for ext4 user images. [DO NOT MERGE]
Merge commit '
671f5fb09f3510c16f73049cad9d8d6d652eaad8' into gingerbread-plus-aosp
* commit '
671f5fb09f3510c16f73049cad9d8d6d652eaad8':
Don't increase partition size for ext4 user images. [DO NOT MERGE]
Joe Onorato [Thu, 16 Sep 2010 17:56:38 +0000 (10:56 -0700)]
am
2818a2e5: (-s ours) am
27ce8811: DO NOT MERGE - Remove extra printf
Merge commit '
2818a2e555df6738fd6434a6e78a48c2acc2aba1'
* commit '
2818a2e555df6738fd6434a6e78a48c2acc2aba1':
DO NOT MERGE - Remove extra printf
Ying Wang [Thu, 16 Sep 2010 17:54:03 +0000 (10:54 -0700)]
Don't increase partition size for ext4 user images. [DO NOT MERGE]
Change-Id: I5b82e6f7bd1c25ce3b1a4c16409b61aa1be7f71f
Joe Onorato [Thu, 16 Sep 2010 16:43:23 +0000 (09:43 -0700)]
am
ca378ad4: (-s ours) am
25ab3dcc: Merge "DO NOT MERGE - Add a -knowntags option to droiddoc" into gingerbread
Merge commit '
ca378ad41295ed23e3dce9d9ce824e5b1ab0bffb'
* commit '
ca378ad41295ed23e3dce9d9ce824e5b1ab0bffb':
DO NOT MERGE - Add a -knowntags option to droiddoc
Joe Onorato [Thu, 16 Sep 2010 16:43:20 +0000 (09:43 -0700)]
am
d68519af: am
9e59ec29: Merge "Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules." into gingerbread
Merge commit '
d68519af91198164d6f302ea53656649f23cdca9'
* commit '
d68519af91198164d6f302ea53656649f23cdca9':
Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules.
Joe Onorato [Thu, 16 Sep 2010 16:36:47 +0000 (09:36 -0700)]
am
27ce8811: DO NOT MERGE - Remove extra printf
Merge commit '
27ce8811835e9bbc9e230a618e883d30d0101c9e' into gingerbread-plus-aosp
* commit '
27ce8811835e9bbc9e230a618e883d30d0101c9e':
DO NOT MERGE - Remove extra printf
Joe Onorato [Thu, 16 Sep 2010 16:34:07 +0000 (12:34 -0400)]
DO NOT MERGE - Remove extra printf
Change-Id: I8a2e4fac78010fe531b080d3555557e557c038b9
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 04:43:14 +0000 (21:43 -0700)]
am
9090c4c1: (-s ours) am
da21ccf8: Grandfather the simulator-specific modules. do not merge.
Merge commit '
9090c4c1d77d574a7213724314a64f65a458e84c'
* commit '
9090c4c1d77d574a7213724314a64f65a458e84c':
Grandfather the simulator-specific modules. do not merge.
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 [Thu, 16 Sep 2010 02:51:50 +0000 (19:51 -0700)]
Grandfather the simulator-specific modules.
Those aren't new modules that were added recently, they just never got
considered when generating the original list of grandfathered modules
Change-Id: I01c63f57be71146671cd3a7445baa774163262d8
Jean-Baptiste Queru [Thu, 16 Sep 2010 02:02:26 +0000 (19:02 -0700)]
am
05ad00ea: am
5890600d: Add a better explanation about how to deal with user modules
Merge commit '
05ad00eac9edda58c5cd3110853a6b93d6cc4e89'
* commit '
05ad00eac9edda58c5cd3110853a6b93d6cc4e89':
Add a better explanation about how to deal with user modules
Doug Zongker [Thu, 16 Sep 2010 00:54:07 +0000 (17:54 -0700)]
am
bc843297: am
135a120e: remove the system board name from the build fingerprint
Merge commit '
bc84329757c6b79e1f10c418057e599ee106135c'
* commit '
bc84329757c6b79e1f10c418057e599ee106135c':
remove the system board name from the build fingerprint
Jean-Baptiste Queru [Thu, 16 Sep 2010 00:53:46 +0000 (17:53 -0700)]
am
24ab0f58: am
85f351d1: Merge "Allow devices without AndroidBoard.mk" into gingerbread
Merge commit '
24ab0f58f45fe27ddb48e279c1e0be8105dc8f96'
* commit '
24ab0f58f45fe27ddb48e279c1e0be8105dc8f96':
Allow devices without AndroidBoard.mk
Ying Wang [Thu, 16 Sep 2010 00:53:22 +0000 (17:53 -0700)]
am
6674ec30: am
659adc0b: Merge "Change "make PRODUCT-XXX-tests" to build only tests-build-target" into gingerbread
Merge commit '
6674ec30bb92337e3bccb67bca53555a798a493f'
* commit '
6674ec30bb92337e3bccb67bca53555a798a493f':
Change "make PRODUCT-XXX-tests" to build only tests-build-target
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
Jean-Baptiste Queru [Wed, 15 Sep 2010 21:25:00 +0000 (14:25 -0700)]
Manual merge into master
Change-Id: Ib71bf36e1205e0bbf1f375cee4a28bceaba60c97
Jean-Baptiste Queru [Wed, 15 Sep 2010 20:43:18 +0000 (13:43 -0700)]
Merge "Fail the build when using a user tag on a non-legacy module."
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 18:39:19 +0000 (11:39 -0700)]
am
2b3b26f5: am
32afccc7: Revert "Default host module tag to optional."
Merge commit '
2b3b26f5b13e1b21b66e846a87b844309782d089'
* commit '
2b3b26f5b13e1b21b66e846a87b844309782d089':
Revert "Default host module tag to optional."
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.
The supported mechanism is to explicitly add the module
name to the PRODUCT_PACKAGES of the relevant product definitions.
Change-Id: Ic754446e15965d468d1bbe85864275e2cda9b3aa
Jean-Baptiste Queru [Wed, 15 Sep 2010 17:49:52 +0000 (10:49 -0700)]
Merge "Grandfather in a few more modules"
Jean-Baptiste Queru [Wed, 15 Sep 2010 17:48:47 +0000 (10:48 -0700)]
Grandfather in a few more modules
Change-Id: Ib8fe72fd91e432219323523f6c242cb6210145cc
Joe Onorato [Wed, 15 Sep 2010 17:23:32 +0000 (10:23 -0700)]
Merge "Add option to fail when Android.mk files change PRODUCT_* variables."
Jean-Baptiste Queru [Wed, 15 Sep 2010 16:53:05 +0000 (09:53 -0700)]
Merge "Explicitly manage fonts and ICU data"
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
Jean-Baptiste Queru [Wed, 15 Sep 2010 14:06:40 +0000 (07:06 -0700)]
am
e893cd2d: (-s ours) am
6e8b268d: Fail the build when using a user tag on a non-legacy module. do not merge
Merge commit '
e893cd2d5e2c4433536649c7f2aa7b97bb5b8171'
* commit '
e893cd2d5e2c4433536649c7f2aa7b97bb5b8171':
Fail the build when using a user tag on a non-legacy module. do not merge
Ying Wang [Wed, 15 Sep 2010 14:06:36 +0000 (07:06 -0700)]
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 18:33:41 +0000 (11:33 -0700)]
Explicitly manage fonts and ICU data
Change-Id: I2fa61378956ccc230b4268b4cc201e7e9950f111
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: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:27:12 +0000 (13:27 -0700)]
Revert "Default host module tag to optional."
This reverts commit
528362f07460cfee42190e68ee2ffde4f08f0af4.
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 18:33:41 +0000 (11:33 -0700)]
Explicitly manage fonts and ICU data
Change-Id: If08edf37f06d9978326202797c52a0cae2f71d3e
Joe Onorato [Tue, 14 Sep 2010 17:09:48 +0000 (13:09 -0400)]
Add option to fail when Android.mk files change PRODUCT_* variables.
It's turned off for now.
Change-Id: I0b5a3ce5fdc7693c8ebd870312f0c2e13fdb8b22
Jean-Baptiste Queru [Tue, 14 Sep 2010 16:52:25 +0000 (09:52 -0700)]
merge
dd1d0016 to master
Change-Id: Ib83cd76a959fa6209f4920021d3dbf5d61fa6b8e
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 [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