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
6a112e85b7
Check NDK linking, expose SDK_VERSION to Make am: a96ff64527
am: e996f78112
am: 4811b8c822
...
am: 3135ecb786
Change-Id: Ia04027ed9021060c4ee000e466d0392a1f16aeeb
2016-06-08 20:06:45 +00:00
Dan Willemsen
3135ecb786
Check NDK linking, expose SDK_VERSION to Make am: a96ff64527
am: e996f78112
...
am: 4811b8c822
Change-Id: I31f519b2f9ad3c25d14ad1e920f9a8090c248c70
2016-06-08 20:01:37 +00: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
67681fd014
Merge changes Ia7e7fb61,Iede67e2c am: 92ca32e6b9
am: aa40abedb6
am: e7b704b3fc
...
am: d353a160ae
Change-Id: I2e61e8e786401518b659dbcc83c872118d0d810f
2016-06-08 04:56:12 +00:00
Dan Willemsen
d353a160ae
Merge changes Ia7e7fb61,Iede67e2c am: 92ca32e6b9
am: aa40abedb6
...
am: e7b704b3fc
Change-Id: I1ef73f95e5178eaa67c3ad715714c0b2e61a54bf
2016-06-08 04:53:40 +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
a13d78bc0d
Allow -lz on Darwin am: 29d9f87e7f
am: ea07d1690e
am: 3e2a0db3e7
...
am: 23ebb40571
* commit '23ebb40571362dc64f150b546c32dfe6dc25058f':
Allow -lz on Darwin
Change-Id: I3052ae09bcff7cba46b22f689ccb8199af114552
2016-06-06 23:44:30 +00:00
Dan Willemsen
23ebb40571
Allow -lz on Darwin am: 29d9f87e7f
am: ea07d1690e
...
am: 3e2a0db3e7
* commit '3e2a0db3e7864e1ced2c3268c58983f8b95ecc50':
Allow -lz on Darwin
Change-Id: I61a60346bb27f6405cc38970f5293076cb53e23b
2016-06-06 23:41:50 +00: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
479cdb369f
Add built/libs/* to root.bp am: 0c41054bec
am: f4ac64c3bf
am: 395e4c3f69
...
am: d3a0a23b3c
* commit 'd3a0a23b3c15704ecc1fbe13dbe411099c5c3560':
Add built/libs/* to root.bp
Change-Id: I19c77b93440956b6da49a0e19b7e2ec537d3dfde
2016-06-06 23:11:24 +00:00
Dan Willemsen
d3a0a23b3c
Add built/libs/* to root.bp am: 0c41054bec
am: f4ac64c3bf
...
am: 395e4c3f69
* commit '395e4c3f69c2173d36276d26f2e86e69f10dcdba':
Add built/libs/* to root.bp
Change-Id: I06100647b291a79802e62b0c3e849dd054a124cc
2016-06-06 23:08:54 +00: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
0ab0d37e99
androidmk: TOP is always "." am: 22abd40ed0
am: f3e12048de
am: da2972572b
...
am: 09518ffd6d
* commit '09518ffd6d70186b15b8637f1ff098024fde8021':
androidmk: TOP is always "."
Change-Id: Icf1231b08814fff5a9439129dfd867e1c9f0f966
2016-06-06 19:33:18 +00:00
Dan Willemsen
cc0cf21f02
androidmk: Support version_script am: 58f9bb1160
am: 0f1501c099
am: 8e4f43962c
...
am: 7b5ca8dc05
* commit '7b5ca8dc0504d43a5080aeab6100aa2a398016e7':
androidmk: Support version_script
Change-Id: Ie2f74c98d21d264c1a637fc81fe1b289fa2aae44
2016-06-06 19:32:52 +00:00
Dan Willemsen
1435a170cd
androidmk: Update LOCAL_SANITIZE* support am: 0c236aba6e
am: e014fecf4f
am: 6ae7876ba4
...
am: a306715b3a
* commit 'a306715b3a16a0b8039074602794f80adc33a00d':
androidmk: Update LOCAL_SANITIZE* support
Change-Id: Ifc40b7aae7e600ab2f2e9ac15a422b613a555152
2016-06-06 19:32:51 +00:00
Dan Willemsen
56d0b583f8
Add _<OS> suffix support, remove USE_MINGW am: 31a6a69f9f
am: e8cca4eda9
am: 38f1901138
...
am: 3a5e4d104c
* commit '3a5e4d104c3b7e0cee6fae47d2813f422fd9d4ff':
Add _<OS> suffix support, remove USE_MINGW
Change-Id: I6665c91bed5216fc77e39f1fddbc0c520fb2b262
2016-06-06 19:32:51 +00:00
Dan Willemsen
568303e4a0
Add logtags support to androidmk am: 42e20e6063
am: 046b841dd3
am: f1e61fcee1
...
am: 26eb81dda8
* commit '26eb81dda84168c8d53533f9b7a4b0dfa6378384':
Add logtags support to androidmk
Change-Id: I1e5994d1baf2940948eb1bec4812d08edd063a39
2016-06-06 19:32:50 +00:00
Dan Willemsen
80c4346e5d
Add tests for androidmk am: 6c2ac0673d
am: 54a7e882c8
am: 9426841e33
...
am: 9bfd471c96
* commit '9bfd471c96cc97a0d8e2a17b4eef8ac7e4384161':
Add tests for androidmk
Change-Id: Ie08238f6931fa412adc3a8b4a51d95da6cbb5118
2016-06-06 19:32:50 +00:00
Dan Willemsen
09518ffd6d
androidmk: TOP is always "." am: 22abd40ed0
am: f3e12048de
...
am: da2972572b
* commit 'da2972572bbff6bb2ad7f8f4a4dac08b061b3165':
androidmk: TOP is always "."
Change-Id: I3c073592c688bf735625f8a7798f49c5e0844e32
2016-06-06 19:30:31 +00:00
Dan Willemsen
7b5ca8dc05
androidmk: Support version_script am: 58f9bb1160
am: 0f1501c099
...
am: 8e4f43962c
* commit '8e4f43962c86398373060e93f4995174f9031ae9':
androidmk: Support version_script
Change-Id: I4b7ff47f126e02e2c9ceaaee55ad38ba6ce0f67b
2016-06-06 19:30:05 +00:00
Dan Willemsen
a306715b3a
androidmk: Update LOCAL_SANITIZE* support am: 0c236aba6e
am: e014fecf4f
...
am: 6ae7876ba4
* commit '6ae7876ba457cd1fb8bf0980f328d5e073377be4':
androidmk: Update LOCAL_SANITIZE* support
Change-Id: I23169aa82eda284744414827b5775f23d674341e
2016-06-06 19:30:05 +00:00
Dan Willemsen
3a5e4d104c
Add _<OS> suffix support, remove USE_MINGW am: 31a6a69f9f
am: e8cca4eda9
...
am: 38f1901138
* commit '38f190113886dcd7a7af22662931fccdd0d2e160':
Add _<OS> suffix support, remove USE_MINGW
Change-Id: Ie2766fb038bd10bad1cd7ec81305c80ba52510b3
2016-06-06 19:30:04 +00:00
Dan Willemsen
26eb81dda8
Add logtags support to androidmk am: 42e20e6063
am: 046b841dd3
...
am: f1e61fcee1
* commit 'f1e61fcee1d41e70c1231c05a2cbf9d4852aa6d8':
Add logtags support to androidmk
Change-Id: Ie9cd3027fa748fe21e035a75ec8c474fe7f16cdf
2016-06-06 19:30:04 +00:00
Dan Willemsen
9bfd471c96
Add tests for androidmk am: 6c2ac0673d
am: 54a7e882c8
...
am: 9426841e33
* commit '9426841e33068df949834ba0ca641aa8726ed675':
Add tests for androidmk
Change-Id: Ia3d276a213358a88eee191f1362e7290a5c187e7
2016-06-06 19:30:03 +00: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