Commit graph

1108 commits

Author SHA1 Message Date
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
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
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
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
c320e63497 more modules with user tags that need to br grandfathered in
Change-Id: Iad72076094d028499bac516271fd422c4b15cb92
2010-09-08 15:48:28 -07:00
Jean-Baptiste Queru
ea08763d5e one more module grandfathered with a user tag
Change-Id: I22d60c33df06cfe0bfd2041a611c762e6e662c94
2010-09-08 15:46:28 -07:00
Jean-Baptiste Queru
ccc10925b7 fix typo
Change-Id: If4acf972380a94b160a656f849c4106025d3e6b2
2010-09-08 15:28:41 -07:00
Jean-Baptiste Queru
ba3ed0c7d0 a few more existing user modules to be grandfathered in - DO NOT MERGE
Change-Id: I6a2337bb557735276c93c306caac43a59abff47c
2010-09-08 15:15:15 -07:00
Jean-Baptiste Queru
0dda5a191d a few more existing user modules to be grandfathered in - DO NOT MERGE
Change-Id: Ie50faf26b5db9ac3c46f50da8c48c6132d4f2d1b
2010-09-08 15:12:07 -07:00
Dan Bornstein
29ff8c85c1 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.
2010-09-08 14:38:03 -07:00
Jean-Baptiste Queru
b81c3989cb 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
2010-09-08 14:34:47 -07:00
Dan Bornstein
3177afa817 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.
2010-09-08 14:34:21 -07:00
Jean-Baptiste Queru
22e620c4be a few more existing user modules to be grandfathered in - DO NOT MERGE
Change-Id: I5f4c9f9ac948c2ba6865eae7dca2c0ed4d10702b
2010-09-08 14:19:06 -07:00
Jean-Baptiste Queru
4074f2377c Warn when new modules are found that use user tags
Change-Id: I49369cc1596f269e0964f0a6a88bcc7152209bde
2010-09-08 12:44:06 -07:00
Dan Bornstein
ca917dc2b2 Merge "Enable WITH_HOST_DALVIK for "user" builds on Linux." into gingerbread 2010-09-08 12:37:11 -07:00
Jean-Baptiste Queru
130b539bfd 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
2010-09-08 12:21:43 -07:00
Jean-Baptiste Queru
890ef4b0aa a few more existing user modules to be grandfathered in - DO NOT MERGE
Change-Id: I7526ad40f27853a2f83bc0c4c4f80ff709fcaf40
2010-09-08 12:18:17 -07:00
Jean-Baptiste Queru
78a59022f8 a few more grandfathered user tags - DO NOT MERGE
Change-Id: Ia625817d3f332f8760835b3fa20e56c00c305166
2010-09-08 12:12:01 -07:00
Dan Bornstein
f13bdd94dc Enable WITH_HOST_DALVIK for "user" builds on Linux.
Bug: 2497274
Change-Id: I636895b52c82f301f8c288ae670b34e1dbf32cc5
2010-09-08 11:19:27 -07:00
Jean-Baptiste Queru
6b747cfb21 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
2010-09-08 10:32:52 -07:00
Jean-Baptiste Queru
a90f9d2c29 Merge "Warn when new modules are found that use user tags - DO NOT MERGE" into gingerbread 2010-09-08 10:22:48 -07:00
Jean-Baptiste Queru
fff865f06f 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"
2010-09-07 10:56:53 -07:00
Jean-Baptiste Queru
8f731bb272 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"
2010-09-07 10:53:46 -07:00
Jean-Baptiste Queru
0545c9160d Revert "Allow properties with spaces in their values"
This reverts commit de3bfade57.
2010-09-07 10:51:12 -07:00
Ying Wang
30d68a3b9d 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
2010-09-07 10:29:34 -07:00
Ying Wang
817f07aef0 Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE
Cherry-pick from master.

Change-Id: I0a56e3e91efd53ad2671136b6fe00ee675f56230
2010-09-07 10:26:18 -07:00
Jean-Baptiste Queru
39de432897 Warn when new modules are found that use user tags - DO NOT MERGE
Change-Id: Ia563765f3d0161d7c851a0162d65c2a249b4dd38
2010-09-03 17:39:10 -07:00
Ying Wang
90ca11a2d3 Fix the unstripped path if LOCAL_MODULE_PATH is set.
Bug: 2953067

Change-Id: I12a0bdb1f3df4fa98bea70f60e0ce26bf863c924
2010-09-03 16:24:01 -07:00
Doug Zongker
a4a50996ac am c637db16: remove remaining amend support
Merge commit 'c637db16d83b2c248b1cf0122e2ba558ed95762c' into gingerbread-plus-aosp

* commit 'c637db16d83b2c248b1cf0122e2ba558ed95762c':
  remove remaining amend support
2010-09-03 12:39:15 -07:00
Doug Zongker
c637db16d8 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
2010-09-03 11:58:31 -07:00
Joe Onorato
f06675e2a4 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.
2010-09-03 10:36:46 -07:00
Ying Wang
54b634dce8 am a79db6e4: am 3dae0ee4: Fix inherited dependency when instrmentation.
Merge commit 'a79db6e47a378cb089021a56637a9c6925f14261'

* commit 'a79db6e47a378cb089021a56637a9c6925f14261':
  Fix inherited dependency when instrmentation.
2010-09-03 10:36:41 -07:00
Joe Onorato
4b1e224585 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.
2010-09-03 10:28:00 -07:00
Joe Onorato
c5b8d4ceb6 Merge "The old clean target had bit rotted." into gingerbread 2010-09-03 10:26:04 -07:00
Joe Onorato
dfc5e0cb7b The old clean target had bit rotted.
Clean and clobber are now the same thing.

Change-Id: I4873d40496b16e13689e22c48cff1fecdffb8b40
2010-09-03 13:25:11 -04:00
Ying Wang
a79db6e47a am 3dae0ee4: Fix inherited dependency when instrmentation.
Merge commit '3dae0ee46cf5fcde6eb424f9ab0c69f2d901a671' into gingerbread-plus-aosp

* commit '3dae0ee46cf5fcde6eb424f9ab0c69f2d901a671':
  Fix inherited dependency when instrmentation.
2010-09-03 10:21:37 -07:00