Commit Graph

81513 Commits

Author SHA1 Message Date
Dan Willemsen
0c236aba6e androidmk: Update LOCAL_SANITIZE* support
Change-Id: Ib3d5473869f69e9e3a74ebb403653e5918ad240a
2016-06-03 12:57:05 -07:00
Dan Willemsen
31a6a69f9f Add _<OS> suffix support, remove USE_MINGW
USE_MINGW is no longer supported by Make

Change-Id: I399190ac9e92a2e633bf5438d8deb653beae1bb1
2016-06-03 12:57:05 -07:00
Dan Willemsen
42e20e6063 Add logtags support to androidmk
Generalize the list splitting function used by include_dirs and
export_include_dirs to also support splitting sources.

Change-Id: I11b8f817fb32309511522074fe6b26052ae3d65f
2016-06-03 12:57:05 -07:00
Dan Willemsen
6c2ac0673d Add tests for androidmk
Change-Id: Ic31bf68f75c8dd4d7737d9ea01f2d93637cdaca2
2016-06-03 00:00:50 -07:00
Colin Cross
f477f0570f Simplify arch target handling am: a1ad8d1889 am: 25e5580db4 am: 056fc8ec40
am: f3dfe58499

* commit 'f3dfe58499623fd48ad265b823d084e5ba27a1c5':
  Simplify arch target handling

Change-Id: Ie7441ebeeef7010ac36b68c8fc875a750da45a9c
2016-06-03 03:40:51 +00:00
Colin Cross
f3dfe58499 Simplify arch target handling am: a1ad8d1889 am: 25e5580db4
am: 056fc8ec40

* commit '056fc8ec40d20a3c988abb4bacc9283b55dc167b':
  Simplify arch target handling

Change-Id: Ie16ddd110970f65b495a0cee7133e6cbcf3be2a5
2016-06-03 03:34:04 +00:00
Colin Cross
056fc8ec40 Simplify arch target handling am: a1ad8d1889
am: 25e5580db4

* commit '25e5580db4b13b1e910f3e015f624f2363c35465':
  Simplify arch target handling

Change-Id: I8274858c13addb1c3e05fac7f0251b3352cb07f9
2016-06-03 03:27:30 +00:00
Colin Cross
25e5580db4 Simplify arch target handling
am: a1ad8d1889

* commit 'a1ad8d1889e81be97b98f19969ed9147094f199c':
  Simplify arch target handling

Change-Id: I540ab5e038c5822ac705c620cc21c100f93544c8
2016-06-03 03:20:08 +00:00
Colin Cross
4aaa5e3b0d Revert "Simplify arch target handling" am: b9db480385 am: 5e7cb20110 am: ce8042244c
am: 5269454738

* commit '5269454738a563c170efd8087cc5ac6706baf01d':
  Revert "Simplify arch target handling"

Change-Id: Ie356e932a116620897f3d892962772de10b3b970
2016-06-03 02:31:10 +00:00
Colin Cross
05a8dcd51a Simplify arch target handling am: 54c7112c43 am: 63e3302a90 am: 88a7b7804a
am: 210377f293

* commit '210377f2932f5a49434f5a538a953aa8999c9017':
  Simplify arch target handling

Change-Id: Ia8212f53adc81eb84808f54856e79f67ed287772
2016-06-03 02:31:08 +00:00
Colin Cross
5269454738 Revert "Simplify arch target handling" am: b9db480385 am: 5e7cb20110
am: ce8042244c

* commit 'ce8042244cd92e2ffe631075ec59c7065894959e':
  Revert "Simplify arch target handling"

Change-Id: I7460c36407c068d30bb6465d84717f87142c3220
2016-06-03 02:22:37 +00:00
Colin Cross
210377f293 Simplify arch target handling am: 54c7112c43 am: 63e3302a90
am: 88a7b7804a

* commit '88a7b7804ab19abb9f44e407155f19904e24c6ed':
  Simplify arch target handling

Change-Id: Ibfcfef4b4f6531d3ad7d0b0f2b75cefbebde18ae
2016-06-03 02:22:35 +00:00
Colin Cross
ce8042244c Revert "Simplify arch target handling" am: b9db480385
am: 5e7cb20110

* commit '5e7cb20110a6411ccf00b6c54785e36c7fd93794':
  Revert "Simplify arch target handling"

Change-Id: Ieff753cc419ddf9826a13b1dcca3ab8f7bf16ade
2016-06-03 02:12:34 +00:00
Colin Cross
88a7b7804a Simplify arch target handling am: 54c7112c43
am: 63e3302a90

* commit '63e3302a90e29b645dbb55ecdb8b53980058e67a':
  Simplify arch target handling

Change-Id: I78bfb32997a8daf6b4b04bf79e14b85f4d0cc1f6
2016-06-03 02:12:31 +00:00
Colin Cross
a1ad8d1889 Simplify arch target handling
Soong's multi-architecture building has grown complex, with the
combination of HostOrDevice+HostType+Arch necessary to determine how to
build a variant of a module, and three separate mutators to split each
into its variations.

Combine HostOrDevice+HostType into Os, which will be Linux, Darwin,
Windows, or Android.  Store Os+Arch as a single Target.

Change-Id: I92f2e2dac53617d595a35cc285d2bd348baa0fbd
2016-06-02 19:09:32 -07:00
Colin Cross
5e7cb20110 Revert "Simplify arch target handling"
am: b9db480385

* commit 'b9db480385745a9f42ea3f49a16877cb048960a9':
  Revert "Simplify arch target handling"

Change-Id: I82a58035bd4c1f542164d8e2295d9f0dac347284
2016-06-03 02:03:24 +00:00
Colin Cross
63e3302a90 Simplify arch target handling
am: 54c7112c43

* commit '54c7112c4325426eabda5fa96a8d3c4f61cb8cc7':
  Simplify arch target handling

Change-Id: I030a590fc59b5d674daf2a6b83169fdc16b0701e
2016-06-03 02:03:17 +00:00
Colin Cross
b9db480385 Revert "Simplify arch target handling"
This reverts commit 6713fb26cbcadf525cd75e47d7d0cbc23d282b3e.

Change-Id: Ic473cea2563b0b37dc08b0bc5d3a0ac8c4b6afe6
2016-06-03 01:50:47 +00:00
Colin Cross
54c7112c43 Simplify arch target handling
Soong's multi-architecture building has grown complex, with the
combination of HostOrDevice+HostType+Arch necessary to determine how to
build a variant of a module, and three separate mutators to split each
into its variations.

Combine HostOrDevice+HostType into Os, which will be Linux, Darwin,
Windows, or Android.  Store Os+Arch as a single Target.

Change-Id: Iae677eff61a851b65a7192a47f2dc17c1abb4160
2016-06-02 17:37:02 -07:00
Dan Willemsen
4cc2a5b49d Add support for logtags am: 0fda89f4a8 am: c6b1ed56b7 am: 0d4e7bb37f
am: fc1b1ebfc0

* commit 'fc1b1ebfc03d8e436029872897fa4bc65388b477':
  Add support for logtags

Change-Id: I31584cad8d8ca2957db31111531fe22739db20e6
2016-06-02 01:22:23 +00:00
Dan Willemsen
fc1b1ebfc0 Add support for logtags am: 0fda89f4a8 am: c6b1ed56b7
am: 0d4e7bb37f

* commit '0d4e7bb37fdb3e45d4a55e788e821a40b6adeea3':
  Add support for logtags

Change-Id: I355b3f6338fc7b74320b8031c979a3dc0817bbc2
2016-06-02 00:06:29 +00:00
Dan Willemsen
0d4e7bb37f Add support for logtags am: 0fda89f4a8
am: c6b1ed56b7

* commit 'c6b1ed56b7ae2d0243e2403b5ef510eb8646ee68':
  Add support for logtags

Change-Id: I455605463380060601f2be7b84dbfc0801a04a40
2016-06-01 23:54:11 +00:00
Dan Willemsen
c6b1ed56b7 Add support for logtags
am: 0fda89f4a8

* commit '0fda89f4a80223d0adb01e0f44a0575c83956ea0':
  Add support for logtags

Change-Id: I81e4e56e2229d78e16c687f2e3b2fee18fdb6c7d
2016-06-01 23:47:42 +00:00
Dan Willemsen
0fda89f4a8 Add support for logtags
This lets modules declare logtags files, which will then be exported to
make using LOCAL_LOGTAGS_FILES. Make still generates event-log-tags and
the java code.

Bug: 28989759
Change-Id: Ie6be79d3ef8a17a74d42eba681a25a08b4c0e7ae
2016-06-01 15:31:28 -07:00
Colin Cross
fee6c4e9be Merge changes I92cea061,I67705c5c am: 1cdcf50b4b am: d2420c22d7 am: 8332e0e52d
am: 18a3b32207

* commit '18a3b322077dd98154f3af8ca7ecc3a16b094f2e':
  Add spaces around := when dumping assignments
  Fix govet issue

Change-Id: I00d2f267e073c315e5baab34799970b87a7fce41
2016-06-01 05:14:04 +00:00
Colin Cross
18a3b32207 Merge changes I92cea061,I67705c5c am: 1cdcf50b4b am: d2420c22d7
am: 8332e0e52d

* commit '8332e0e52d4c692c869df6121675b1c114e9d952':
  Add spaces around := when dumping assignments
  Fix govet issue

Change-Id: Id70fa92e755675de22cd3078992fb611c69a6def
2016-06-01 05:09:58 +00:00
Colin Cross
8332e0e52d Merge changes I92cea061,I67705c5c am: 1cdcf50b4b
am: d2420c22d7

* commit 'd2420c22d7c07215ce07e742a1680831c2936d20':
  Add spaces around := when dumping assignments
  Fix govet issue

Change-Id: Ice058419ead096aff6c280444e2850ef1dd141c2
2016-06-01 05:05:57 +00:00
Colin Cross
d2420c22d7 Merge changes I92cea061,I67705c5c
am: 1cdcf50b4b

* commit '1cdcf50b4b68243795b40b75fd4d9b91478ccb90':
  Add spaces around := when dumping assignments
  Fix govet issue

Change-Id: I3b7767ef6e271c8be7db36847279d292f3094bfc
2016-06-01 05:01:55 +00:00
Colin Cross
1cdcf50b4b Merge changes I92cea061,I67705c5c
* changes:
  Add spaces around := when dumping assignments
  Fix govet issue
2016-06-01 04:53:26 +00:00
Dan Willemsen
1b323f42ce Start using blueprint_go_binary am: c2aa4a9c52 am: efc8c86371 am: 636a1bcbf6
am: f9f554bb87

* commit 'f9f554bb8711ec8dba1a1bde4b1bb933410ab69e':
  Start using blueprint_go_binary

Change-Id: Icc9614c7a27793971c4a0ff88d3f7ce1dddb4fba
2016-06-01 02:57:44 +00:00
Dan Willemsen
f9f554bb87 Start using blueprint_go_binary am: c2aa4a9c52 am: efc8c86371
am: 636a1bcbf6

* commit '636a1bcbf6cdba969386f1dd8d22c3251b4f8d04':
  Start using blueprint_go_binary

Change-Id: I3abe6f66d20db591e73562d59a6dcb7daa52eb63
2016-06-01 02:53:30 +00:00
Dan Willemsen
636a1bcbf6 Start using blueprint_go_binary am: c2aa4a9c52
am: efc8c86371

* commit 'efc8c863714ab271332a3e3ad2f0924c427ae3af':
  Start using blueprint_go_binary

Change-Id: I46a091a683013823ee601055c4afcd84ad66ab16
2016-06-01 02:49:28 +00:00
Dan Willemsen
efc8c86371 Start using blueprint_go_binary
am: c2aa4a9c52

* commit 'c2aa4a9c52426e3cb9b14788096a817c85ea17aa':
  Start using blueprint_go_binary

Change-Id: I394b666653cc0a09bdecd67e949e48817a1d07ed
2016-06-01 02:45:33 +00:00
Dan Willemsen
c2aa4a9c52 Start using blueprint_go_binary
And install the tools into a more obvious location. soong_env is not
moved, since we need it to exist early, so that we can use it in
soong.bash in case there's a build failure.

Change-Id: I9bd1fa320d84d180b2cf3deb90782d380666f7a6
2016-05-31 18:31:56 -07:00
Dan Willemsen
eeb8d64a46 Support installing non-native arch binaries am: 17f052647f am: a3ecd8752f am: 389dd5da20
am: 542a3ecda5

* commit '542a3ecda5f84f91097249b382bb004e5550a090':
  Support installing non-native arch binaries

Change-Id: I8e7f271af92ac1474c2bc49c2b9ca517402b0f18
2016-06-01 01:28:55 +00:00
Dan Willemsen
542a3ecda5 Support installing non-native arch binaries am: 17f052647f am: a3ecd8752f
am: 389dd5da20

* commit '389dd5da20717f244d3526823b4746fcfd397aa4':
  Support installing non-native arch binaries

Change-Id: I98bb3e976c9d50236371d7c4218e5ecb4885c525
2016-06-01 01:20:10 +00:00
Dan Willemsen
389dd5da20 Support installing non-native arch binaries am: 17f052647f
am: a3ecd8752f

* commit 'a3ecd8752faa4738af75d3ffedff76828cbdfd66':
  Support installing non-native arch binaries

Change-Id: I572140eb973445602d478fe42da32a7a439264bf
2016-06-01 01:15:38 +00:00
Dan Willemsen
a3ecd8752f Support installing non-native arch binaries
am: 17f052647f

* commit '17f052647f5e4afcb3f5c4142d9a2ccec627faab':
  Support installing non-native arch binaries

Change-Id: I66ec9efe6e1362c31f1b0388e26a5815a70ae7bc
2016-06-01 01:11:52 +00:00
Dan Willemsen
17f052647f Support installing non-native arch binaries
For the x86_arm target, which uses two 32-bit architectures, x86
libraries should be installed into ".../lib", and arm libraries should
be installed into ".../lib/arm".

This shouldn't be necessary for binaries, but non-native binaries aren't
supported in Make right now, so we can revisit this once it's necessary.

Change-Id: I4d883c85d3ef4945ff6149d9c4fc81af5023e12b
2016-05-31 16:27:00 -07:00
Colin Cross
5126504fae Add spaces around := when dumping assignments
Add spaces around := when dumping assignments that failed translation.

Change-Id: I92cea0616a9dacd74a63b48f4626340b22542fbf
2016-05-30 13:42:19 -07:00
Colin Cross
079602cba6 Fix govet issue
Change-Id: I67705c5c1240bea6a21b7d62fd26d296d49735d4
2016-05-30 13:42:19 -07:00
Dan Willemsen
9a3da5cd61 Export GLOBAL_[CLANG_]C[PP]FLAGS_NO_OVERRIDE to Make am: 5efc706895 am: a002cea3e8 am: 05ca2c87f0
am: c29e9f008a

* commit 'c29e9f008ab384c311dc031405d655261e207502':
  Export GLOBAL_[CLANG_]C[PP]FLAGS_NO_OVERRIDE to Make

Change-Id: I7959cd118cee965bc64aa4f727b19c1b6f92ce3f
2016-05-28 02:40:52 +00:00
Dan Willemsen
c29e9f008a Export GLOBAL_[CLANG_]C[PP]FLAGS_NO_OVERRIDE to Make am: 5efc706895 am: a002cea3e8
am: 05ca2c87f0

* commit '05ca2c87f0c7bbcbbc2a36fcb8b5e8d5aed838a1':
  Export GLOBAL_[CLANG_]C[PP]FLAGS_NO_OVERRIDE to Make

Change-Id: I86a00c4ecce946c8f852d3620bd35ef4578efb19
2016-05-28 02:37:52 +00:00
Dan Willemsen
05ca2c87f0 Export GLOBAL_[CLANG_]C[PP]FLAGS_NO_OVERRIDE to Make am: 5efc706895
am: a002cea3e8

* commit 'a002cea3e8e507b739a5c0ffa0f21a89e15de8f6':
  Export GLOBAL_[CLANG_]C[PP]FLAGS_NO_OVERRIDE to Make

Change-Id: Iad1e79fb606ece2fb793ef439bd5be06244a540e
2016-05-28 02:35:21 +00:00
Dan Willemsen
a002cea3e8 Export GLOBAL_[CLANG_]C[PP]FLAGS_NO_OVERRIDE to Make
am: 5efc706895

* commit '5efc70689589019e04c1a5fe8975dc2671c9ac7b':
  Export GLOBAL_[CLANG_]C[PP]FLAGS_NO_OVERRIDE to Make

Change-Id: Id5a7471f3cd83128cd537f948015eeb6dfd0bc4f
2016-05-28 02:32:54 +00:00
Dan Willemsen
5efc706895 Export GLOBAL_[CLANG_]C[PP]FLAGS_NO_OVERRIDE to Make
Change-Id: I7f2f37f63720244eb1f3340804c00ae82d36e90b
2016-05-27 15:23:38 -07:00
Dan Willemsen
46df61e213 Remove [local_]include_files am: cd114c1cb7 am: 4ae64644f1 am: f05b4b634e
am: d9af5cbf37

* commit 'd9af5cbf377fa8f6822bd068a0b004d06639aac0':
  Remove [local_]include_files

Change-Id: I29f0c0361181db2bd009767f5c4f3d799c3957c9
2016-05-27 00:21:52 +00:00
Dan Willemsen
0a59eaca72 Export TARGET_TOOLCHAIN_ROOT am: 0bd588787b am: f56a2b16f8 am: 81d0bec0df
am: b78f3f9429

* commit 'b78f3f94290be7ac497adb177a58b4ae20f6ee9f':
  Export TARGET_TOOLCHAIN_ROOT

Change-Id: I05b9960e147302ad486200f4be4ffc183c75cd57
2016-05-27 00:21:52 +00:00
Dan Willemsen
d9af5cbf37 Remove [local_]include_files am: cd114c1cb7 am: 4ae64644f1
am: f05b4b634e

* commit 'f05b4b634e2e2355d5402854f71b109b99193c12':
  Remove [local_]include_files

Change-Id: I303e0e17764745f9079bc187ab0d4e4353812b7b
2016-05-27 00:17:27 +00:00
Dan Willemsen
b78f3f9429 Export TARGET_TOOLCHAIN_ROOT am: 0bd588787b am: f56a2b16f8
am: 81d0bec0df

* commit '81d0bec0df9044aae99a4fcb93dd6b35e88ee13d':
  Export TARGET_TOOLCHAIN_ROOT

Change-Id: I8cdf160f75e1cc8fe17200f7f0490066aba7fa9e
2016-05-27 00:17:26 +00:00