Commit graph

869 commits

Author SHA1 Message Date
Dan Willemsen
f4ac64c3bf Add built/libs/* to root.bp
am: 0c41054bec

* commit '0c41054beccd52c1bcc90347a74fd41a90d72f45':
  Add built/libs/* to root.bp

Change-Id: I94da269bec8d1a1b8b8dd3c748c114b55d09f034
2016-06-06 22:58:43 +00:00
Dan Willemsen
0c41054bec Add built/libs/* to root.bp
Change-Id: I05af556dde2df5a1ef38d1cc9eb557c8e2729490
2016-06-06 14:52:54 -07:00
Dan Willemsen
da2972572b androidmk: TOP is always "." am: 22abd40ed0
am: f3e12048de

* commit 'f3e12048de8877d7e2a36c85aa2917a4f89f50e6':
  androidmk: TOP is always "."

Change-Id: I52328d8d9674384f81d41cdce0b7c182ae3bd35f
2016-06-06 19:28:23 +00:00
Dan Willemsen
8e4f43962c androidmk: Support version_script am: 58f9bb1160
am: 0f1501c099

* commit '0f1501c099bea9c1dee83e0c50f4da4215da5efb':
  androidmk: Support version_script

Change-Id: I964cdc962893a5708b4d5e0f79bca6d4ae2063cf
2016-06-06 19:27:54 +00:00
Dan Willemsen
6ae7876ba4 androidmk: Update LOCAL_SANITIZE* support am: 0c236aba6e
am: e014fecf4f

* commit 'e014fecf4ff8ab8d15b1f5c3307e89c0f4158b04':
  androidmk: Update LOCAL_SANITIZE* support

Change-Id: I7c3acd7244f75bbfb94d1af5f6685a6c723c45ce
2016-06-06 19:27:53 +00:00
Dan Willemsen
38f1901138 Add _<OS> suffix support, remove USE_MINGW am: 31a6a69f9f
am: e8cca4eda9

* commit 'e8cca4eda9ebcdbe3e0bb0bed44e6c3d68931939':
  Add _<OS> suffix support, remove USE_MINGW

Change-Id: Ide7692e1399f11af3dcfb5e965be31050ebf6ac5
2016-06-06 19:27:53 +00:00
Dan Willemsen
f1e61fcee1 Add logtags support to androidmk am: 42e20e6063
am: 046b841dd3

* commit '046b841dd340a0c1dc4ebf9a7274117eb64b19d2':
  Add logtags support to androidmk

Change-Id: Iad28ebf1ae701cbe1bcaeed5c4c18bc1407fb2c6
2016-06-06 19:27:53 +00:00
Dan Willemsen
9426841e33 Add tests for androidmk am: 6c2ac0673d
am: 54a7e882c8

* commit '54a7e882c891d884b8f71416a4c6bbb63ac19a81':
  Add tests for androidmk

Change-Id: Icc1d86b84359a64d00a713d5c781de9d3ba86dd0
2016-06-06 19:27:52 +00:00
Dan Willemsen
f3e12048de androidmk: TOP is always "."
am: 22abd40ed0

* commit '22abd40ed05090927ce7b0ac2c387c353253e7e2':
  androidmk: TOP is always "."

Change-Id: I18188553120b1d5db8993a7702e2a224f3687536
2016-06-06 19:22:47 +00:00
Dan Willemsen
0f1501c099 androidmk: Support version_script
am: 58f9bb1160

* commit '58f9bb1160074f06e2cea66f78dfdf4d42834c59':
  androidmk: Support version_script

Change-Id: I19e7f9d751d171ebdb2115e3833d9a4b6d36a746
2016-06-06 19:22:13 +00:00
Dan Willemsen
e014fecf4f androidmk: Update LOCAL_SANITIZE* support
am: 0c236aba6e

* commit '0c236aba6e8b45ac0fde3c7db627f366e3caeaee':
  androidmk: Update LOCAL_SANITIZE* support

Change-Id: I1002748424251df70837cb4059796df71cb5fb64
2016-06-06 19:22:11 +00:00
Dan Willemsen
e8cca4eda9 Add _<OS> suffix support, remove USE_MINGW
am: 31a6a69f9f

* commit '31a6a69f9fc93905743cf119cb01699144c8de54':
  Add _<OS> suffix support, remove USE_MINGW

Change-Id: I2d6db24a401ec668c91443b9318be5677cb35fce
2016-06-06 19:22:10 +00:00
Dan Willemsen
046b841dd3 Add logtags support to androidmk
am: 42e20e6063

* commit '42e20e60633b11884a7de5c5da9bbd53befb7e86':
  Add logtags support to androidmk

Change-Id: I01cd1f7185db4f83f097665e8f81303196421c46
2016-06-06 19:22:08 +00:00
Dan Willemsen
54a7e882c8 Add tests for androidmk
am: 6c2ac0673d

* commit '6c2ac0673d889dd8a319901812eedaf23fe786c0':
  Add tests for androidmk

Change-Id: Ibafadcfe108cea7879da545f4d352849cb8db4de
2016-06-06 19:22:06 +00:00
Dan Willemsen
22abd40ed0 androidmk: TOP is always "."
But if it comes out to ./, remove both characters.

Change-Id: Ia86c1a60522736773b2e8ee0cf54a4348d302573
2016-06-05 22:47:40 -07:00
Dan Willemsen
58f9bb1160 androidmk: Support version_script
This only translates the common case using $(LOCAL_PATH). If it doesn't
match here, Soong will throw an error with a suggested fix.

Change-Id: If64c8fca008a1a414fc12389e6b1bb40af0df899
2016-06-03 13:56:55 -07:00
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
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
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
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
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
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
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
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
f05b4b634e Remove [local_]include_files am: cd114c1cb7
am: 4ae64644f1

* commit '4ae64644f1eb0b469fb281f2153f9acc8b088c89':
  Remove [local_]include_files

Change-Id: Idd9c7fec804dd2340d10a406d4772ed44d4bc50f
2016-05-26 23:29:46 +00:00
Dan Willemsen
4ae64644f1 Remove [local_]include_files
am: cd114c1cb7

* commit 'cd114c1cb707cb205ddf07e96bb61d97dfee5018':
  Remove [local_]include_files

Change-Id: Ia81168c60b0f1235f16742a23ffbb4b0c5bd6089
2016-05-26 23:27:14 +00:00
Dan Willemsen
cd114c1cb7 Remove [local_]include_files
We don't actually need to do any changes to the path for the include
files, so we can just rely on the include_dir search to work.

It would still be useful to verify that the path isn't something bad,
like an absolute path, but we'll handle that by looking at the cflags in
another change.

Change-Id: I0bd609435969191c4ff91f2cd06eccfb75f5097c
2016-05-26 23:09:46 +00:00
Dan Willemsen
81d0bec0df Export TARGET_TOOLCHAIN_ROOT am: 0bd588787b
am: f56a2b16f8

* commit 'f56a2b16f8346518f365f8410b25856a5bc72913':
  Export TARGET_TOOLCHAIN_ROOT

Change-Id: Idd3fba44cf7910b97192a9b9b8ec57b2ad6a2cba
2016-05-26 22:43:26 +00:00