Commit graph

1787 commits

Author SHA1 Message Date
Dan Willemsen
0a37a2a2b8 Encode default enabled state in OsType
Currently our only default-disabled Os is Windows since it's HostCross,
but we'll be adding non-default Host and Device types in the future.

Bug: 31559095
Test: out/soong/build.ninja is identical
Change-Id: I2bc3a3cc76f2c95ea040bc34ba6706fcc178c68d
2016-11-17 01:49:39 -08:00
Dan Albert
3a31674e7b Support sdk_version: "current" for the NDK. am: ebedf678de am: f17634d777
am: 9ce4703a8e

Change-Id: I360fbb7e080269e8ff35577dc4cb6c69f200ffbe
2016-11-11 02:35:48 +00:00
Dan Albert
9ce4703a8e Support sdk_version: "current" for the NDK. am: ebedf678de
am: f17634d777

Change-Id: I64e16daecb92f4b9dc192b760630d89c72097274
2016-11-11 02:28:49 +00:00
Dan Albert
f17634d777 Support sdk_version: "current" for the NDK.
am: ebedf678de

Change-Id: I4acb096fb922c2c692590dbbf92147a7c54eb795
2016-11-11 02:21:47 +00:00
Dan Albert
abb4284f7c Allow first_version: "current" in ndk_library. am: 90f7a4dcab am: e7754d3f27
am: 568bf7895b

Change-Id: I14bc1c26307e48a861c2e2282151dabdab490a53
2016-11-11 00:08:09 +00:00
Dan Albert
6701b7785e Generate "current" API level. am: fd86e9ee21 am: bb53f9a3cb
am: cdba11e9fe

Change-Id: Ibc3f7949472b27d140cba18a1b3727fad9970fc7
2016-11-11 00:08:08 +00:00
Dan Albert
568bf7895b Allow first_version: "current" in ndk_library. am: 90f7a4dcab
am: e7754d3f27

Change-Id: I068a5bb146ebe039d20edca0293c974f077bdb1a
2016-11-11 00:02:39 +00:00
Dan Albert
cdba11e9fe Generate "current" API level. am: fd86e9ee21
am: bb53f9a3cb

Change-Id: I5ab4fb17026538c7a3a1ebdb56a4f87d7a381342
2016-11-11 00:02:38 +00:00
Dan Albert
e7754d3f27 Allow first_version: "current" in ndk_library.
am: 90f7a4dcab

Change-Id: I7141ce08ce3fbc9506a8d05db33d8a61a84ace8d
2016-11-10 23:55:09 +00:00
Dan Albert
bb53f9a3cb Generate "current" API level.
am: fd86e9ee21

Change-Id: I81251ad8358a6412962e328a85a86f6f42c77d92
2016-11-10 23:55:08 +00:00
Dan Albert
ebedf678de Support sdk_version: "current" for the NDK.
We need to fall back to the old CRT objects since we aren't generating
those yet.

Test: Created a test module using "current", checked that it linked
      the libs from current.
Bug: None

Change-Id: I5fe170d7b26154da8877672ac2acb7da0262fe38
2016-11-10 14:01:08 -08:00
Dan Albert
90f7a4dcab Allow first_version: "current" in ndk_library.
Test: Added a test module that uses this
      find $SOONG_OUT -name libfoo.so # only shows up in current
Bug: None

Change-Id: Ic88d7c598cd5b6ded8fb851a7eaf859806336af7
2016-11-10 14:01:08 -08:00
Dan Albert
f878463c3c Revert "Revert "Use the platform SDK version from the config."" am: 073379e549 am: 1cbdfe9068
am: fb223f6e93

Change-Id: Ieb92293a2c29d44e730f0fdd6c2ba05fa26b7ddd
2016-11-10 21:54:01 +00:00
Dan Albert
61fa90c2b7 Fix the Platform_sdk_version default. am: 22c0b4131d am: cee02d71f7
am: 4286d2c12a

Change-Id: I7b543b2a67912c56b07844b7d0a4af6f4f9f7213
2016-11-10 21:53:59 +00:00
Dan Albert
fd86e9ee21 Generate "current" API level.
Support for using this coming in an upcoming patch.

Test: nose2
      readelf to check the following:
      * bsd_signal unversioned before current
      * bsd_signal versioned in current
      * catclose missing before current
      * catclose present and versioned in current
Bug: None
Change-Id: I861862161426d3ec5b530e3156d3a8ae96fed468
2016-11-10 13:49:26 -08:00
Dan Albert
fb223f6e93 Revert "Revert "Use the platform SDK version from the config."" am: 073379e549
am: 1cbdfe9068

Change-Id: I4d09c4e3310bf7e82c243b6b940a8796e3afdd1a
2016-11-10 21:47:00 +00:00
Dan Albert
4286d2c12a Fix the Platform_sdk_version default. am: 22c0b4131d
am: cee02d71f7

Change-Id: Ic46afde2e4df4eea72cc587424b9411602f1be70
2016-11-10 21:46:59 +00:00
Dan Albert
1cbdfe9068 Revert "Revert "Use the platform SDK version from the config.""
am: 073379e549

Change-Id: I8d333d190f6e7a19de3858b9382383d7179d980b
2016-11-10 21:39:59 +00:00
Dan Albert
cee02d71f7 Fix the Platform_sdk_version default.
am: 22c0b4131d

Change-Id: I7b76711050b3a3aa9164c99fd48c20694367671c
2016-11-10 21:39:58 +00:00
Dan Albert
073379e549 Revert "Revert "Use the platform SDK version from the config.""
This reverts commit 74b8b55bb2.

Test: OUT_DIR=ndk-out DIST_DIR=ndk-dist \
          build/soong/scripts/build-ndk-prebuilts.sh
Bug: None

Change-Id: Ia320609ec6fb382b13ff9007a6496b73198ff871
2016-11-10 11:11:07 -08:00
Dan Albert
22c0b4131d Fix the Platform_sdk_version default.
N has merged into aosp now.

Test: OUT_DIR=ndk-out DIST_DIR=ndk-dist \
          build/soong/scripts/build-ndk-prebuilts.sh
Bug: None

Change-Id: I2685c700e2cb138708a3e8a5f51281c30fb582db
2016-11-10 11:11:07 -08:00
Dan Albert
23a66c2915 Merge "Revert "Use the platform SDK version from the config."" am: 8f0f1757f5 am: c273d449e2
am: e0edc58efe

Change-Id: Id95d39b6275a39c65cb47d85f9f5ca43a6897dc6
2016-11-10 18:16:45 +00:00
Dan Albert
e0edc58efe Merge "Revert "Use the platform SDK version from the config."" am: 8f0f1757f5
am: c273d449e2

Change-Id: I63f83692fe66fc0b33ef3e2e843816079c8dd116
2016-11-10 18:10:14 +00:00
Dan Albert
c273d449e2 Merge "Revert "Use the platform SDK version from the config.""
am: 8f0f1757f5

Change-Id: Ida38854d79f2443f15e5121bb866f17619fd0f0a
2016-11-10 18:03:44 +00:00
Dan Albert
8f0f1757f5 Merge "Revert "Use the platform SDK version from the config."" 2016-11-10 17:47:39 +00:00
Dan Willemsen
baac8b6e69 Merge "Add export_include_dirs to the local include path" am: 7eaa5c8824 am: 4bd310a28a
am: abaccc71fb

Change-Id: Ic4d04865a80626c4a24aeb195e6ab228d20ff7d0
2016-11-10 06:05:27 +00:00
Dan Willemsen
abaccc71fb Merge "Add export_include_dirs to the local include path" am: 7eaa5c8824
am: 4bd310a28a

Change-Id: I28033b20f35ef7639c4dce7e8e7458074b634298
2016-11-10 05:59:26 +00:00
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