Commit Graph

4888 Commits

Author SHA1 Message Date
Colin Cross
b87d9ecb66 Merge changes I4c8cd544,I62d4d43d,I0ae667d4,Id357adc0,I1ff87134 am: ac0cd89283 am: d7f1653e7b am: b3f3a68d0f am: d2cab9dbf3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1445698

Change-Id: I6c398b648b6d170fd0b008b6636c29ebfb90ea6c
2020-10-06 20:15:55 +00:00
Tom Cherry
6ddbb00e24 Reland: "Include system/core/liblog/include instead of using symlinks"
It seems better to include this path directly rather than creating
symlinks in system/core that accomplish the same result.

Bug: 165825252
Test: treehugger
Change-Id: Ic78f09d86039540a2b0eead45e985b42c553f415
2020-10-06 10:45:28 -07:00
Benjamin Schwartz
399394b702 powerstats: PowerStats HAL has been renamed
Bug: 169864180
Test: m
Change-Id: I0db7d731c3aa81b2c9331570c93ec23038bd743c
2020-10-06 10:44:12 -07:00
Colin Cross
ac0cd89283 Merge changes I4c8cd544,I62d4d43d,I0ae667d4,Id357adc0,I1ff87134
* changes:
  Don't create version variations of sdk modules
  Create fewer empty version variants
  Don't make SplitPerApiLevel imply UseSdk
  Remove vendor crt special case
  Fix apex_test.go and add it to Android.bp
2020-10-06 17:33:30 +00:00
Martin Stjernholm
02460abb30 Avoid conflicting shared libraries from SDK snapshots.
Test: m nothing
Test: env SANITIZE_HOST=address \
  SANITIZE_TARGET='hwaddress fuzzer' \
  build/soong/soong_ui.bash --make-mode \
  TARGET_PRODUCT=blueline_hwasan haiku dist
Bug: 170041398
Change-Id: Ifa4f72d6778cbb10663a780c7eb54b5e21d5b571
2020-10-06 04:27:42 +01:00
Colin Cross
565cafdcb1 Don't create version variations of sdk modules
They are never used, skip creating them.

Test: m checkbuild
Change-Id: I4c8cd544327ae79b781f704be5a9064efdbdf2af
2020-10-05 18:57:26 -07:00
Colin Cross
3146c5cd67 Create fewer empty version variants
Don't create empty version variants for binaries, objects, rust
rlibs or rust dylibs.

Test: no change to build.ninja
Change-Id: I62d4d43da476eafdb258a08b5ada758bb2971a1a
2020-10-05 18:57:21 -07:00
Tom Cherry
75b6256d0d Merge "Revert "Include system/core/liblog/include instead of using symlinks"" am: 66fee25c5b am: 042238162e am: 14c51b94c6 am: 670fd6872b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1449380

Change-Id: I95feb7e63e6595488fb9e10dbed4cdb7f2575dc9
2020-10-05 20:50:14 +00:00
Tom Cherry
66fee25c5b Merge "Revert "Include system/core/liblog/include instead of using symlinks"" 2020-10-05 19:26:17 +00:00
Tom Cherry
271f4acd72 Revert "Include system/core/liblog/include instead of using symlinks"
Revert submission 1428983-no-log-header-symlinks

Reason for revert: Build breaks
Reverted Changes:
I248a2f045:Include system/core/liblog/include instead of usin...
Ic189e0f59:Remove logging symlinks from system/core/include

Change-Id: I9ee896f5fde36c879c182365295c1f5a5a39a76b
2020-10-05 19:24:12 +00:00
Tom Cherry
aed112885c Merge "Include system/core/liblog/include instead of using symlinks" am: 24ee3605fa am: f6a4e63413 am: 268f1856fd am: 6e1b73d2dc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1429369

Change-Id: Ieb224be0921cf686bc96377eb566df863fa15df0
2020-10-05 19:02:48 +00:00
Tom Cherry
24ee3605fa Merge "Include system/core/liblog/include instead of using symlinks" 2020-10-05 15:26:51 +00:00
Ivan Lozano
7cde5a2ab6 Merge "rust: Allow rust_bindgen to use cc_defaults." am: 4e7b26a434 am: 46df6b07e3 am: e7b63c6692 am: 03bdbb9c1c am: 8d6a8ef9ae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1439751

Change-Id: I5dd395e73988754708e8c81492af9a300f9e5f0c
2020-10-03 02:03:37 +00:00
Ivan Lozano
4e7b26a434 Merge "rust: Allow rust_bindgen to use cc_defaults." 2020-10-03 00:22:49 +00:00
Colin Cross
1348ce3f13 Don't make SplitPerApiLevel imply UseSdk
UseSdk was returning true when SplitPerApiLevel returned true,
which was causing the platform variant of SplitPerApiLevel
module to compile against the SDK.  Check SplitPerApiLevel
separately in the sdkMutator instead.

Test: m checkbuild
Change-Id: I0ae667d48a3b7b96709a6cad8e8ea9701659fc2a
2020-10-02 13:00:19 -07:00
Colin Cross
b6135218a4 Remove vendor crt special case
It doesn't seem to be necessary, crt objects can get headers via
local_include_dirs.

Test: m checkbuild
Change-Id: Id357adc054c85576aa9935d0acbee5f1ae3dcbff
2020-10-02 13:00:19 -07:00
Pirama Arumuga Nainar
19634f0b0f Merge "Update to use clang-r399163b." am: 0b88bf33fc am: 18fc11a093 am: 55dd45d2eb am: 99ca618579 am: 035d633cf1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1443739

Change-Id: Ibd47de622151303a7f341f1acb36184a85acb5ee
2020-10-02 18:33:14 +00:00
Pirama Arumuga Nainar
0b88bf33fc Merge "Update to use clang-r399163b." 2020-10-02 16:37:52 +00:00
Colin Cross
af4afb7917 Merge changes from topic "sanitizer-runtime-stubs" am: 973f46703b am: 0730dce1c0 am: 0efc79cdd4 am: f7d81e216a am: 40776c7e17
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1437232

Change-Id: I28c538d3650f35158bd8edaed8d5807cec4954d9
2020-10-02 02:58:46 +00:00
Kris Alder
d5a4a952de Merge "add acknowledgements field to fuzz_config" am: 0f1a0f7a81 am: 394e9930b9 am: a55a4eab8d am: 695c0eb7e6 am: 2d3599203f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1442242

Change-Id: I2c5c4f0479bda67b1e4a8607dec49f47541a87c4
2020-10-02 02:26:59 +00:00
Colin Cross
973f46703b Merge changes from topic "sanitizer-runtime-stubs"
* changes:
  Add version dependencies to sanitizer runtime dependencies
  Fix prebuilt library stubs
  Track allowed transitive deps in any updatable module.
2020-10-02 01:06:10 +00:00
Kris Alder
0f1a0f7a81 Merge "add acknowledgements field to fuzz_config" 2020-10-01 23:58:01 +00:00
Stephen Hines
5060c9e558 Update to use clang-r399163b.
Bug: http://b/155835175
Test: aosp_blueline
Change-Id: I34d26da72a36b16491cf328075d817b073acfc0d
2020-09-30 19:07:42 -07:00
Colin Cross
e7257d2019 Add version dependencies to sanitizer runtime dependencies
The hwasan runtime has stubs, make the function to add all version
variants of a shared library available to the sanitizer mutator.

Test: m checkbuild
Change-Id: Ie4124022140f8520834d7bf7b59f0499cd381083
2020-09-30 21:17:59 +00:00
Colin Cross
d48fe734cd Fix prebuilt library stubs
There were multiple stacked issues with prebuilt library stubs that
cancelled eachother out.  Prebuilts were never considered to be
DirectlyInAnyApex by the AndroidMk logic to handle stubs libraries
because it looked it up in the global list of modules in apexes
using the name with the "prebuilt_" prefix.  Fixing that to use
ctx.BaseModuleName() exposed a second issue, that stubs variants
for prebuilt libraries were never created, so there was no latest
version to expose to Make.

Making the *prebuiltLibraryLinker type work with all of the
methods that handle stubs should really be done with an interface
and methods implemented on *libraryDecorator, but that would
also cause other types like that embed libraryDecorator to
participate in stubs that may trigger more issues.  I'd like
to replace those methods anyways, so just manually handle
*prebuiltLibraryLinker for now.

Test: m checkbuild
Change-Id: I1267ee01659ad9ab11d75318c6c6bdbf8f72a061
2020-09-30 21:17:51 +00:00
Yi Kong
78387f9b14 Merge "Do not implicitly turn on lto for static libraries" am: 21de510915 am: a5e515b85a am: 9903727782 am: 355e0e1512 am: 7a856f9d08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1440495

Change-Id: I1937b487d3a5e462797e5d2c030964390efd3c73
2020-09-30 04:00:39 +00:00
Yi Kong
21de510915 Merge "Do not implicitly turn on lto for static libraries" 2020-09-30 01:42:10 +00:00
Treehugger Robot
198ee1d790 Merge "Add support of test data to python_host_test" am: 025ae97b0e am: 7cfb58c3f4 am: 88f0a9458b am: 48471f78a6 am: 7a663a68ec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1433195

Change-Id: Ia17b9d4a0667a3271d27f07ad0104a65553bb938
2020-09-30 00:37:16 +00:00
Kris Alder
2598c9b350 add acknowledgements field to fuzz_config
This will be used to track who should be recognized for any CVEs
resulting from bugs found by a fuzz target.

Bug: 145745999
Test: n/a
Change-Id: I21e065ab8013d013b1d9f42981c729b996163387
2020-09-29 22:28:18 +00:00
Treehugger Robot
025ae97b0e Merge "Add support of test data to python_host_test" 2020-09-29 21:56:19 +00:00
Yi Kong
e2577141ba Do not implicitly turn on lto for static libraries
For global ThinLTO, don't implicitly turn on LTO for static libraries,
but instead rely on mutator to generate correct variants.

Bug: 169004486
Test: GLBOAL_THINLTO=true m
Change-Id: I9cdeea706ec6dd4ad31f55b9e12a96b42176aa89
2020-09-30 01:13:57 +08:00
Martin Stjernholm
00855813c7 Merge "Retain all stubs versions in the snapshot." am: b7c77bd889 am: 4883f2e60c am: 93c4cb8430 am: 451b2d3c80 am: c05238ce45
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1441333

Change-Id: Ib6241371d2bf1ed657812017fe374da6f81b4c4f
2020-09-29 15:51:12 +00:00
Martin Stjernholm
b7c77bd889 Merge "Retain all stubs versions in the snapshot." 2020-09-29 13:59:05 +00:00
Martin Stjernholm
dddb0dacc3 Merge "Propagate all sanitizer flags in SDK snapshots." am: dc6f2b06be am: ed53b5b4f6 am: ed13b58341 am: 13f7ea7ed3 am: 914d2f277d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1427729

Change-Id: I5247de71fc51ba7bd2928a0447d67216a83eff5c
2020-09-29 12:54:44 +00:00
Martin Stjernholm
dc6f2b06be Merge "Propagate all sanitizer flags in SDK snapshots." 2020-09-29 10:43:08 +00:00
Yi Kong
d88f1fa80b Merge "Forbid -fwhole_program_vtables" am: 15bad7a9cf am: 7cbfba1f32 am: b7b3eb6a74 am: b0b3793396 am: f408894985
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1433955

Change-Id: Ie7a47eaeb3d91944f866c3e1049720de839a7c7c
2020-09-29 01:54:26 +00:00
Yi Kong
15bad7a9cf Merge "Forbid -fwhole_program_vtables" 2020-09-28 23:56:02 +00:00
Treehugger Robot
486aa3a4df Merge "lto: Rename Disabled to Never to reduce confusion" am: f1a406cdd6 am: 57d0d3916a am: c98e32702a am: 459599a303 am: 7a684f23d3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1440494

Change-Id: Ieec8ffa1ab773e5f78f429d07ed9280eda0a682c
2020-09-28 22:55:27 +00:00
Treehugger Robot
a312770456 Merge changes Id412359e,I9c4d3a33,Ic3216235 am: ca17414206 am: 70cea45d8e am: ef5534114c am: 192d515e63 am: 24fadfd1cb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1439754

Change-Id: I407daeb9d8cd4237b848e7ef3dba8d60d3e2c612
2020-09-28 22:54:00 +00:00
Treehugger Robot
f1a406cdd6 Merge "lto: Rename Disabled to Never to reduce confusion" 2020-09-28 21:47:16 +00:00
Martin Stjernholm
618b671bf4 Retain all stubs versions in the snapshot.
This is a quick fix to avoid build failures due to prebuilts lacking
stubs versions that the sources have, which causes dependencies on
older version stubs fail on master-art-host where the sources of e.g.
Bionic are no longer available.

More work is required to make the version handling of stubs DTRT - a
TODO comment outlines it.

Test: m nothing
Test: `m runtime-module-sdk`, check that the generated Android.bp
  has the full stubs.versions list like the sources.
Bug: 169373910
Change-Id: I0ebfaf94f9d45a0e58d9785c40e7cea626f0ab83
2020-09-28 22:32:02 +01:00
Treehugger Robot
ca17414206 Merge changes Id412359e,I9c4d3a33,Ic3216235
* changes:
  Fix ChooseSdkVersion after api levels
  Don't export flags from SourceProvider variants
  Simplify missing whole_static_libs checking
2020-09-28 20:27:10 +00:00
Treehugger Robot
6ddb6097aa Merge "Remove InputRootAbsolutePath spec to header-abi-dumper" am: a6b38f2d3e am: 446ec378fc am: 7e24b199b5 am: 52fe5a97c9 am: c0c8932759
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1407532

Change-Id: I2abf14d038ba1a1bec6a38a59d2b009cf55b854b
2020-09-28 19:55:20 +00:00
Treehugger Robot
a6b38f2d3e Merge "Remove InputRootAbsolutePath spec to header-abi-dumper" 2020-09-28 17:45:41 +00:00
Yi Kong
f43ff059ff lto: Rename Disabled to Never to reduce confusion
Having different name from the underlying property is confusing...

Test: build
Change-Id: Ia24b664d6cded68abed2966455193f0e20757e06
2020-09-28 17:18:36 +00:00
Yo Chiang
03657c4a9f Merge "soong: Exclude system shared libs from fix suggestions" am: 19dfeee7d5 am: 22fa34d496 am: 608f5d70a1 am: 1c8e5b008a am: b968547539
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1433952

Change-Id: I27f03660107924612004f8110b25042a4d740b7e
2020-09-28 05:49:08 +00:00
Yo Chiang
19dfeee7d5 Merge "soong: Exclude system shared libs from fix suggestions" 2020-09-28 03:54:27 +00:00
Yu-Han Yang
6229f2123c Merge "Add GNSS AIDL interfaces (build/soong)" 2020-09-26 02:34:36 +00:00
Treehugger Robot
e3cd9f7433 Merge "Add type information to symbolfile and ndkstubgen." am: 9dd2c4d543 am: 4aced67bf0 am: a3447367c9 am: ac1ec64369 am: f366b3fcea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1347983

Change-Id: Ie27b64d7b8f26386270fb1896a8387d8cdc4c621
2020-09-26 02:04:26 +00:00
Colin Cross
7812fd3814 Fix ChooseSdkVersion after api levels
I2954bb21c1cfdeb305f25cfb6c8711c930f6ed50 switched normalizeVersions
to work on ApiLevels, which inadvertantly caused it to return "current"
instead of "10000" for libraries that specify "current" in their stubs
property.  ChooseSdkVersion couldn't handle "current" because it was
manually converting the version to an int.  Switch ChooseSdkVersion
to use ApiLevels instead so that it can handle "current".

Test: m checkbuild
Change-Id: Id412359e092483ba419118dd03bc206fae702a96
2020-09-26 00:53:03 +00:00