Commit Graph

3271 Commits

Author SHA1 Message Date
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
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
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
Jean-Baptiste Queru 251ef626bb 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
2010-09-08 15:51:27 -07:00
Jean-Baptiste Queru 0c312bfa37 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
2010-09-08 15:51:24 -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 7d6e54e49c am ccc10925: fix typo
Merge commit 'ccc10925b7da2200c6a5ddfa17bf31c517e9da7a' into gingerbread-plus-aosp

* commit 'ccc10925b7da2200c6a5ddfa17bf31c517e9da7a':
  fix typo
2010-09-08 15:31:52 -07:00
Jean-Baptiste Queru ccc10925b7 fix typo
Change-Id: If4acf972380a94b160a656f849c4106025d3e6b2
2010-09-08 15:28:41 -07:00
Jean-Baptiste Queru e0cb0fd3f5 resolved conflicts for merge of ba3ed0c7 to gingerbread-plus-aosp
Change-Id: I68ff2cd2350721b43b6620c763cfbac5f6805beb
2010-09-08 15:24:06 -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
Jean-Baptiste Queru 4d4721fe1e 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
2010-09-08 14:38:06 -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 38938d12e4 Merge "Warn when new modules are found that use user tags" 2010-09-08 14:08:45 -07:00
Jean-Baptiste Queru 1c436bfef3 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
2010-09-08 13:14:04 -07:00
Jean-Baptiste Queru 2d85efaa91 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
2010-09-08 13:13:58 -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
Jeff Hamilton 724fdabcfc Merge "Add more cleanspecs for the property files, fixing ro.secure." 2010-09-08 12:31:10 -07:00
Jeff Hamilton f5d730d5aa Add more cleanspecs for the property files, fixing ro.secure.
Change-Id: Iae47959c25ca9779df7679528d1d61ebd3c48b50
2010-09-08 14:26:13 -05:00