Commit Graph

941 Commits

Author SHA1 Message Date
Colin Cross 2867296203 Remove blueprint/parser.Ident
Follows blueprint change c32c47938f

Change-Id: I8f479704504f7bbefed3ed63bd0d040f65a2fdd5
2016-06-14 19:03:10 -07:00
Dan Willemsen fbbf4f33ce Export strip information to Make am: 7517ed0b46
am: 0d3a8db293

Change-Id: I356c11662f0b787eb12ad1a28e2c2478e8d1877c
2016-06-11 01:49:18 +00:00
Dan Willemsen 0d3a8db293 Export strip information to Make
am: 7517ed0b46

Change-Id: Iddc18066525592eb25fa9f5ff3a892b4de1f6cf8
2016-06-11 01:45:23 +00:00
Dan Willemsen 7517ed0b46 Export strip information to Make
Change-Id: I3c69451a505ac2b97f3112050acc4b64b1cd7394
2016-06-10 17:20:30 -07:00
Colin Cross 9846b961ea Update androidmk to match blueprint changes am: d20b36be5d
am: 3a162164d0

Change-Id: Icbe5bb962d04f2e405a5b4333492c9b80929f248
2016-06-09 19:39:07 +00:00
Colin Cross 3a162164d0 Update androidmk to match blueprint changes
am: d20b36be5d

Change-Id: I0ab8ed42b51758032c33def7b43ff8629cb56943
2016-06-09 19:32:16 +00:00
Colin Cross 4f66ea370d Rename androidmk/test.go so go test can find it am: a43f9b3cbf
am: ce701b066c

Change-Id: I78ff5aaf1122c2d21a2f08f36ca5a81f9b879d60
2016-06-09 00:25:34 +00:00
Colin Cross ce701b066c Rename androidmk/test.go so go test can find it
am: a43f9b3cbf

Change-Id: Ia9c4f4856b394d687f874cfcccb3b8095561fc45
2016-06-09 00:23:04 +00:00
Colin Cross d20b36be5d Update androidmk to match blueprint changes
blueprint/parser.Value is now an Expression interface, update androidmk
to match.

Change-Id: I01e0b2a83cf430c1981b450d35c8ab0aab6975f1
2016-06-08 14:50:11 -07:00
Colin Cross a43f9b3cbf Rename androidmk/test.go so go test can find it
Change-Id: If18c749fe9bc883552952284a469ea8e8f3e8f6d
2016-06-08 14:49:55 -07:00
Dan Willemsen 4811b8c822 Check NDK linking, expose SDK_VERSION to Make am: a96ff64527
am: e996f78112

Change-Id: I903231f0af81360e3674400da2fc09d741d86fe3
2016-06-08 19:59:16 +00:00
Dan Willemsen e996f78112 Check NDK linking, expose SDK_VERSION to Make
am: a96ff64527

Change-Id: I14799208403500ce00a53c6ebea79eecc8b1b368
2016-06-08 19:56:48 +00:00
Dan Willemsen a96ff64527 Check NDK linking, expose SDK_VERSION to Make
Modules defining sdk_version should only be allowed to link against the
ndk prebuilt libraries and other modules defining sdk_version. Implement
this, and expose the necessary information to Make so that it can be
implemented there as well.

Change-Id: I051498b595f8711883bc120f0394b8bfe2f65bce
2016-06-07 21:52:12 -07:00
Dan Willemsen e7b704b3fc Merge changes Ia7e7fb61,Iede67e2c am: 92ca32e6b9
am: aa40abedb6

Change-Id: Idb59e3b230e5458f243d6467b21d68e10834b303
2016-06-08 04:51:14 +00:00
Dan Willemsen aa40abedb6 Merge changes Ia7e7fb61,Iede67e2c
am: 92ca32e6b9

Change-Id: If71495c0eb882782b186d5a61971c92de1d7754c
2016-06-08 04:48:35 +00:00
Dan Willemsen 92ca32e6b9 Merge changes Ia7e7fb61,Iede67e2c
* changes:
  androidmk: Fix LOCAL_FORCE_STATIC_EXECUTABLE
  Implement re-exporting of library headers
2016-06-08 04:43:18 +00:00
Dan Willemsen c79e0e7dd3 androidmk: Fix LOCAL_FORCE_STATIC_EXECUTABLE
Change-Id: Ia7e7fb61ffff212a5b6170743c429417a528cef3
2016-06-06 22:34:37 -07:00
Dan Willemsen 490a8dc2d5 Implement re-exporting of library headers
This matches LOCAL_EXPORT_(SHARED|STATIC)_LIBRARY_HEADERS in Make.

Change-Id: Iede67e2c24a24cf51e68a50123299effbe4e4196
2016-06-06 18:35:57 -07:00
Dan Willemsen 3e2a0db3e7 Allow -lz on Darwin am: 29d9f87e7f
am: ea07d1690e

* commit 'ea07d1690e12b8c6181bccd590eab46c3e62ba11':
  Allow -lz on Darwin

Change-Id: I5870ea7efc97444c391f2d823c9355732eb26ed9
2016-06-06 23:40:17 +00:00
Dan Willemsen ea07d1690e Allow -lz on Darwin
am: 29d9f87e7f

* commit '29d9f87e7fb4df985a665ccd560146237859afae':
  Allow -lz on Darwin

Change-Id: I295a610874d97622f0d2dd2107eb63ab159c3e49
2016-06-06 23:34:12 +00:00
Dan Willemsen 29d9f87e7f Allow -lz on Darwin
Change-Id: Ied37d4dca499f55e28494d1ce8eac59122827d67
2016-06-06 16:26:48 -07:00
Dan Willemsen 395e4c3f69 Add built/libs/* to root.bp am: 0c41054bec
am: f4ac64c3bf

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

Change-Id: I2f6ba9b1e5dec90d9dd441894f9e158d4e990187
2016-06-06 23:05:23 +00:00
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