Commit Graph

3392 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
12722d34c8 Merge "Explicitly manage fonts and ICU data" 2010-09-15 09:53:05 -07:00
Jean-Baptiste Queru
4555fb9c2e 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
2010-09-15 09:48:01 -07:00
Jean-Baptiste Queru
78c5ff6d37 another module that needs to be grandfathered in
Change-Id: I37e0e0ae0056a2315e1102f79fd923143928f6fe
2010-09-15 09:43:42 -07:00
Jean-Baptiste Queru
81503a1fd7 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
2010-09-15 09:25:36 -07:00
Jean-Baptiste Queru
0dfcdcb8b4 another module that needs to be grandfathered in
Change-Id: Ibf24b4507b0c367117c33476a07d7189aeb3dff7
2010-09-15 09:22:52 -07:00
Jean-Baptiste Queru
e3dccb5f62 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
2010-09-15 08:16:34 -07:00
Jean-Baptiste Queru
6dc2a83250 another module that needs to be grandfathered in
Change-Id: I024ba177e6ca4745e38feb2395e57c46354c2eea
2010-09-15 08:06:05 -07:00
Jean-Baptiste Queru
7819cf0318 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
2010-09-15 07:06:40 -07:00
Ying Wang
8e052ff521 am f6332cfa: am b125c81c: Refine the comment.
Merge commit 'f6332cfaf2b64e0c7436bd80c8b9cb145c0ff5b1'

* commit 'f6332cfaf2b64e0c7436bd80c8b9cb145c0ff5b1':
  Refine the comment.
2010-09-15 07:06:36 -07:00
Ying Wang
db2cb63612 Change "make PRODUCT-XXX-tests" to build only tests-build-target
Change-Id: Ib1a1a7b09ea6f1c3eea84394dcd6e3ebcda81e1a
2010-09-14 16:32:12 -07:00
Jean-Baptiste Queru
c9c3fd3043 Explicitly manage fonts and ICU data
Change-Id: I2fa61378956ccc230b4268b4cc201e7e9950f111
2010-09-14 14:42:10 -07:00
Jean-Baptiste Queru
30dfc9a6b8 Revert "Explicitly manage fonts and ICU data"
This reverts commit b315d46bc8.
2010-09-14 14:08:00 -07:00
Jean-Baptiste Queru
2a499f499e Merge "Revert "Default host module tag to optional."" 2010-09-14 13:28:05 -07:00
Jean-Baptiste Queru
2b3b26f5b1 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."
2010-09-14 13:27:46 -07:00
Jean-Baptiste Queru
423c15c25b Revert "Default host module tag to optional."
This reverts commit 528362f074.
2010-09-14 13:27:12 -07:00
Jean-Baptiste Queru
32afccc732 Revert "Default host module tag to optional."
This reverts commit 528362f074.
2010-09-14 13:25:42 -07:00
Jean-Baptiste Queru
b315d46bc8 Explicitly manage fonts and ICU data
Change-Id: If08edf37f06d9978326202797c52a0cae2f71d3e
2010-09-14 13:01:08 -07:00
Joe Onorato
8dc8faaaea Add option to fail when Android.mk files change PRODUCT_* variables.
It's turned off for now.

Change-Id: I0b5a3ce5fdc7693c8ebd870312f0c2e13fdb8b22
2010-09-14 13:13:27 -04:00
Jean-Baptiste Queru
0dfe1884ba merge dd1d0016 to master
Change-Id: Ib83cd76a959fa6209f4920021d3dbf5d61fa6b8e
2010-09-14 09:52:29 -07:00
Jean-Baptiste Queru
e893cd2d5e 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
2010-09-14 09:44:07 -07:00
Ying Wang
f6332cfaf2 am b125c81c: Refine the comment.
Merge commit 'b125c81cfcf9aea02c05f292c9eceb4e0bd66c87' into gingerbread-plus-aosp

* commit 'b125c81cfcf9aea02c05f292c9eceb4e0bd66c87':
  Refine the comment.
2010-09-14 09:43:03 -07:00
Ying Wang
dd1d00163c 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.
2010-09-14 09:43:01 -07:00
Jean-Baptiste Queru
6e8b268dec 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
2010-09-14 08:59:21 -07:00
Ying Wang
b125c81cfc Refine the comment.
The host tools include script as well as native binaries.

Change-Id: I8bdd62bf5117ac71e2607d2cb4cd7b08bcbe7b14
2010-09-13 18:33:31 -07:00
Ying Wang
69de539a09 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
2010-09-13 18:11:11 -07:00
Ying Wang
744e646032 am 74005c3c: am 528362f0: Default host module tag to optional.
Merge commit '74005c3c2df04e035000426909a060f6149fd1d6'

* commit '74005c3c2df04e035000426909a060f6149fd1d6':
  Default host module tag to optional.
2010-09-13 17:24:04 -07:00
Dmitry Shmidt
2a0b83e57e Merge "Add "ip" utility to all builds" 2010-09-13 16:58:03 -07:00
Dmitry Shmidt
738dbba83d Add "ip" utility to all builds
Change-Id: Iad392d127bd7f6ee014710a9c7479e3aaa92e743
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-09-13 16:54:37 -07:00
Ying Wang
74005c3c2d am 528362f0: Default host module tag to optional.
Merge commit '528362f07460cfee42190e68ee2ffde4f08f0af4' into gingerbread-plus-aosp

* commit '528362f07460cfee42190e68ee2ffde4f08f0af4':
  Default host module tag to optional.
2010-09-13 15:09:25 -07:00
Ying Wang
528362f074 Default host module tag to optional.
Change-Id: I8ae572b368e7ecdcc8e5bb257bb2f6084b5fb508
2010-09-13 14:56:15 -07:00
Doug Zongker
d3b5916be6 resolved conflicts for merge of 8ae62ec7 to master
Change-Id: Ieb424d1a8467ca13dae43190387e1137c1e396c9
2010-09-13 14:37:20 -07:00
Doug Zongker
8ae62ec722 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
2010-09-13 11:51:09 -07:00
Doug Zongker
ea5d7a9de7 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
2010-09-12 15:26:16 -07:00
Ying Wang
3e642c463e am 796a2df1: am 73ca57f5: Fix host-dexed libraries.
Merge commit '796a2df1f49f8c69b22c0a37c730b994a68cacb6'

* commit '796a2df1f49f8c69b22c0a37c730b994a68cacb6':
  Fix host-dexed libraries.
2010-09-10 18:52:51 -07:00
Ying Wang
796a2df1f4 am 73ca57f5: Fix host-dexed libraries.
Merge commit '73ca57f5e688280599f507c10ebaf702506cc799' into gingerbread-plus-aosp

* commit '73ca57f5e688280599f507c10ebaf702506cc799':
  Fix host-dexed libraries.
2010-09-10 18:49:47 -07:00
Ying Wang
73ca57f5e6 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
2010-09-10 18:43:33 -07:00
Ying Wang
6d76cad5fe resolved conflicts for merge of 31d4f53b to master
Change-Id: I87eff140bf68908d009e45687aff26f447a9b9b4
2010-09-10 17:38:54 -07:00
Ying Wang
31d4f53b96 am f7912e4e: Support to build host dex.
Merge commit 'f7912e4ee0ceb014117c66369485f0aa9ea7cf08' into gingerbread-plus-aosp

* commit 'f7912e4ee0ceb014117c66369485f0aa9ea7cf08':
  Support to build host dex.
2010-09-10 17:21:33 -07:00
Gary King
f4bf5f3022 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
2010-09-10 16:21:56 -07:00
Ying Wang
55d110a7d4 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
2010-09-10 16:19:38 -07:00
Ying Wang
f7912e4ee0 Support to build host dex.
Change-Id: I55df5e4051dbeb89a70d6d7b89fb6110f133d9d7
2010-09-10 16:19:24 -07:00
Ying Wang
9c76255031 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
2010-09-10 18:47:06 -04:00
Gary King
1c4f64b594 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
2010-09-10 15:42:30 -07:00
Jean-Baptiste Queru
f09f80d182 am 93847f53: am cc84526b: Merge "Add atom optimization flags"
Merge commit '93847f5355204635648d791098dd0210e22d53ab'

* commit '93847f5355204635648d791098dd0210e22d53ab':
  Add atom optimization flags
2010-09-10 14:52:25 -07:00
Ying Wang
bcd1e1c858 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
2010-09-10 14:46:01 -07:00
Ying Wang
570a0eeffb 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
2010-09-10 14:39:33 -07:00
Gary King
1e80c294ff [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>
2010-09-10 14:29:50 -07:00
Jean-Baptiste Queru
93847f5355 am cc84526b: Merge "Add atom optimization flags"
Merge commit 'cc84526bcef5ffd7ed9abf73dc3bfc9e29784b22' into gingerbread-plus-aosp

* commit 'cc84526bcef5ffd7ed9abf73dc3bfc9e29784b22':
  Add atom optimization flags
2010-09-10 13:03:13 -07:00
Jean-Baptiste Queru
cc84526bce Merge "Add atom optimization flags" 2010-09-09 14:07:21 -07:00
Jean-Baptiste Queru
654fd19be1 am 7d6e54e4: am ccc10925: fix typo
Merge commit '7d6e54e49c43136aa34cc8806a954b22aa875f07'

* commit '7d6e54e49c43136aa34cc8806a954b22aa875f07':
  fix typo
2010-09-08 15:51:49 -07:00