Commit graph

1910 commits

Author SHA1 Message Date
Dan Willemsen
4bd310a28a Merge "Add export_include_dirs to the local include path"
am: 7eaa5c8824

Change-Id: I010919ca36256d42b232294fd6c19b3603abea6b
2016-11-10 05:52:26 +00:00
Treehugger Robot
7eaa5c8824 Merge "Add export_include_dirs to the local include path" 2016-11-10 05:42:42 +00:00
Colin Cross
03e5d5db2c Merge "Pass PREBUILT_SDK_VERSION to soong ndk build" am: 7f1c10b9b1 am: 9022833edd
am: 8e5d3fbbf7

Change-Id: I46b9d28cbfd759a9611e368cb7a939a801bb7033
2016-11-10 01:12:29 +00:00
Colin Cross
8e5d3fbbf7 Merge "Pass PREBUILT_SDK_VERSION to soong ndk build" am: 7f1c10b9b1
am: 9022833edd

Change-Id: Ib327ae46f861ec42b64af93939c34f63000a8f57
2016-11-10 01:06:58 +00:00
Colin Cross
9022833edd Merge "Pass PREBUILT_SDK_VERSION to soong ndk build"
am: 7f1c10b9b1

Change-Id: I9a28bc60d1bd9ed4d2f89a2df1c8070ca23fd8ff
2016-11-10 01:00:59 +00:00
Colin Cross
7f1c10b9b1 Merge "Pass PREBUILT_SDK_VERSION to soong ndk build" 2016-11-10 00:47:33 +00:00
Colin Cross
9fe6ea834f Pass PREBUILT_SDK_VERSION to soong ndk build
Extract PREBUILT_SDK_VERSION from the make build system and pass
it to soong when doing ndk builds.

Test: untested
Change-Id: I573900dfb83aa8665c2bc349b7823e64497754d3
2016-11-09 13:01:41 -08:00
Dan Albert
74b8b55bb2 Revert "Use the platform SDK version from the config."
This reverts commit 9bef523809.

Reason for revert: Broke things

Change-Id: Ic3deac4fb6992572ac0cc95fa04d003e0c29f113
2016-11-09 19:39:42 +00:00
Dan Albert
1ae8e8da4a Merge "Use the platform SDK version from the config." am: fc75232555 am: 92dccfb8bb
am: 32495dd4cf

Change-Id: I5b8457afb1d2b0880ca2caf936a48f3fec2c4117
2016-11-09 00:36:59 +00:00
Dan Albert
32495dd4cf Merge "Use the platform SDK version from the config." am: fc75232555
am: 92dccfb8bb

Change-Id: I928a01240b9a63a1c9ea9f29a3ba4559884b2f5e
2016-11-09 00:31:28 +00:00
Dan Albert
92dccfb8bb Merge "Use the platform SDK version from the config."
am: fc75232555

Change-Id: I3308c23587dff4098bf959877e92142fc9b08835
2016-11-09 00:25:58 +00:00
Treehugger Robot
fc75232555 Merge "Use the platform SDK version from the config." 2016-11-09 00:17:46 +00:00
Dan Albert
bc0ecb0819 Add development/ndk/Android.bp. am: d56d359f8c am: d59dfec028
am: 4de0c9c29b

Change-Id: I4fd73624cdd25443ad24f9240e562fece480563b
2016-11-08 23:03:38 +00:00
Dan Albert
4de0c9c29b Add development/ndk/Android.bp. am: d56d359f8c
am: d59dfec028

Change-Id: I4f81fa3959cc32a535cbdd6936da968126cddc78
2016-11-08 22:57:56 +00:00
Dan Albert
d59dfec028 Add development/ndk/Android.bp.
am: d56d359f8c

Change-Id: Ief8a7b2bc0821e5fa8e91c80443347a1ed3cca90
2016-11-08 22:52:25 +00:00
Dan Albert
9bef523809 Use the platform SDK version from the config.
N is in AOSP now.

Test: make ndk && ls out/soong/ndk/platforms/android-24
Bug: None
Change-Id: I846ee12d10e962931bf22c94c37cdf7207dd4ff7
2016-11-08 12:53:39 -08:00
Dan Albert
d56d359f8c Add development/ndk/Android.bp.
Test: make native
Bug: None
Change-Id: I9eed4a63fa797a17c9ef20c73ec4e03b52791c2d
2016-11-08 11:43:45 -08:00
Dan Willemsen
273af7f3aa Add export_include_dirs to the local include path
Bug: 32641232
Test: ./soong builds compared before/after
Change-Id: If417a9f2278f42ffa524fccfd34f2b01a8cc9fb5
2016-11-07 22:31:32 +00:00
Colin Cross
3e1ca97f86 Merge "Support genrules with multiple tools" am: a5662d5e4e am: 63374ebf31
am: f8f8bf7db9

Change-Id: I02ca872431ab9836d37e100e0e245943a0697be5
2016-11-07 20:48:53 +00:00
Colin Cross
f8f8bf7db9 Merge "Support genrules with multiple tools" am: a5662d5e4e
am: 63374ebf31

Change-Id: I72f602124ba9bd993c35cf4c50524537f8179d26
2016-11-07 20:43:53 +00:00
Colin Cross
63374ebf31 Merge "Support genrules with multiple tools"
am: a5662d5e4e

Change-Id: If50ee2a86e777d4bbd2963da257f515184214668
2016-11-07 20:39:01 +00:00
Colin Cross
a5662d5e4e Merge "Support genrules with multiple tools" 2016-11-07 20:28:25 +00:00
Colin Cross
6f080dff81 Support genrules with multiple tools
To allow genrules with more than one tool, rename the tool property to
tools and make it an array, replace $tool with $(location <label>),
and use $() for other variables for consistency.

Also remove the host bin directory from the genrule path, and the
$srcDir variable, using either of them would have caused dependency
issues.

Bug: 31948427
Test: compare build.ninja
Change-Id: Icf6d3bce2bea00fec1363fd65c0bdf96d09281bf
(cherry picked from commit de6bd86d24)
2016-11-07 10:53:49 -08:00
Colin Cross
e1a65f5785 Merge "Add android.Expand" am: 6718d0ffac am: a912be4d5b
am: e1ea22d40c

Change-Id: I4c85fb59954d3d4faa6ee0c8341953532ab2585f
2016-11-05 08:17:52 +00:00
Colin Cross
e1ea22d40c Merge "Add android.Expand" am: 6718d0ffac
am: a912be4d5b

Change-Id: Ie56fd303acc3114afb524ebdc625c28850b98958
2016-11-05 08:13:21 +00:00
Colin Cross
a912be4d5b Merge "Add android.Expand"
am: 6718d0ffac

Change-Id: I76cec89f9ec6965d43967322aa9592b2cd177d0b
2016-11-05 08:08:51 +00:00
Treehugger Robot
6718d0ffac Merge "Add android.Expand" 2016-11-05 08:04:09 +00:00
Dan Albert
455ee4018c Merge "Support a "platform-only" version tag." am: f543ff67ad am: a562428df4
am: ebcb32f295

Change-Id: I5c09b4c4c99519f85b2afaac10dd1f5263d33638
2016-11-05 00:49:55 +00:00
Dan Albert
ebcb32f295 Merge "Support a "platform-only" version tag." am: f543ff67ad
am: a562428df4

Change-Id: I3415520164ac850611cca3271df4f7fe8b2caeb9
2016-11-05 00:46:25 +00:00
Dan Albert
a562428df4 Merge "Support a "platform-only" version tag."
am: f543ff67ad

Change-Id: I6e09d6593e1240c535fbe66b1f7c5a8cb613e47d
2016-11-05 00:42:55 +00:00
Treehugger Robot
f543ff67ad Merge "Support a "platform-only" version tag." 2016-11-05 00:35:47 +00:00
Colin Cross
6bde0948d2 Add android.Expand
Add android.Expand to expand $() variables in properties.

Test: expand_test
Bug: 31948427
Change-Id: Id30856a1d21d02e8997fcf2358e4a5feeede05be
2016-11-04 15:59:23 -07:00
Dan Albert
300cb2fe87 Support a "platform-only" version tag.
We tried to support this by version name convention (foo_PLATFORM and
foo_PRIVATE), but not everything follows those conventions. libm has
a LIBC_DEPRECATED, which is a bit to generic to apply this convention
to.

Support a "platform-only" tag which omits the tagged version in the
NDK.

Test: nose2
Bug: None
Change-Id: Iba34628ea02a813d22c8b32d10e54064f17ac6df
2016-11-04 14:52:30 -07:00
Colin Cross
403a913290 Merge "Move globbing to Blueprint" am: 19ce4bddf1 am: 1797477765
am: e5c87367be

Change-Id: Icb10a9d6efdbb46a6873f68250e8ecf52279cafd
2016-11-04 18:24:47 +00:00
Colin Cross
e5c87367be Merge "Move globbing to Blueprint" am: 19ce4bddf1
am: 1797477765

Change-Id: Ifc3329349a1390bf8abaaffc81e3e82f7f304844
2016-11-04 18:21:16 +00:00
Colin Cross
1797477765 Merge "Move globbing to Blueprint"
am: 19ce4bddf1

Change-Id: Ib46054619cfb12beefe1a5d03bddc1be567f212c
2016-11-04 18:17:40 +00:00
Colin Cross
19ce4bddf1 Merge "Move globbing to Blueprint" 2016-11-04 18:09:36 +00:00
Colin Cross
5a1fa54b5f Merge "Move more includes from -isystem to -I" am: fea56e1220 am: f723c11136
am: 81cd4d532b

Change-Id: I53f1ef23494021cd7d4ec3d1f3c6759dee927bb8
2016-11-04 15:42:51 +00:00
Colin Cross
81cd4d532b Merge "Move more includes from -isystem to -I" am: fea56e1220
am: f723c11136

Change-Id: I3b2a8175d5d142fbb7fddd163e9329266c240bb6
2016-11-04 15:38:51 +00:00
Colin Cross
f723c11136 Merge "Move more includes from -isystem to -I"
am: fea56e1220

Change-Id: I9b530954788cddccff712b0a7a666e2f5772da30
2016-11-04 15:35:20 +00:00
Colin Cross
fea56e1220 Merge "Move more includes from -isystem to -I" 2016-11-04 15:31:32 +00:00
Colin Cross
7f19f37443 Move globbing to Blueprint
Move Soong's globbing-with-dependencies support into Blueprint so it can
be used for subdirs= lines in Android.bp files.

Blueprint has a slight change in behavior around subname= lines, it now
always uses the subname and doesn't fall back to Blueprints.  To support
the Blueprints files in build/blueprint, use them directly with build=.

Test: build, add source file that matches glob, rebuild
Change-Id: Ifd0b0d3bc061aae0a16d6c7ca9a1cd8672656b4d
2016-11-04 04:54:16 +00:00
Colin Cross
520d90a81a Merge "Add proto property struct" am: 28f9094ee7 am: 04972fa4bc
am: 8af5d92639

Change-Id: Ic76fb7a2099418843f69b2a426b20bc00e9ef1fa
2016-11-04 01:14:30 +00:00
Colin Cross
8af5d92639 Merge "Add proto property struct" am: 28f9094ee7
am: 04972fa4bc

Change-Id: Ie98d53877845624864b2d35cfefe41e8f610dd46
2016-11-04 01:11:00 +00:00
Colin Cross
04972fa4bc Merge "Add proto property struct"
am: 28f9094ee7

Change-Id: Ifeff48c97c5c9013e8bf27c5dd342bce2a422130
2016-11-04 01:07:30 +00:00
Treehugger Robot
28f9094ee7 Merge "Add proto property struct" 2016-11-04 01:02:27 +00:00
Dan Willemsen
2d77add9b4 Add support for Implicit Outputs am: 9f3c574a39 am: 610c494886
am: 27431e8759

Change-Id: I7adae6178da3b55dc8054c3b508bf7b3536e171d
2016-11-04 01:00:29 +00:00
Dan Willemsen
27431e8759 Add support for Implicit Outputs am: 9f3c574a39
am: 610c494886

Change-Id: I739fa01aaae58516fcb4e8db222aba607e3e0b0d
2016-11-04 00:57:29 +00:00
Dan Willemsen
610c494886 Add support for Implicit Outputs
am: 9f3c574a39

Change-Id: I6958429c73a4c6e656241b75d444506a2832acc1
2016-11-04 00:53:59 +00:00
Colin Cross
328f04e778 Move more includes from -isystem to -I
-isystem hides all warnings.  There were no warnings in
hardware/libhardware_legacy/include, hardware/ril/include, or
libnativehelper/include, move them from -isystem to -I.

Test: m -j native
Bug: 31751828
Change-Id: I64cf08b6f6a7f2cfbb19f7d3cc2d2cc9f0157a38
2016-11-03 15:49:36 -07:00