Commit Graph

27521 Commits

Author SHA1 Message Date
Martin Stjernholm 79bee057a3 Merge "Handle property structs and BpPropertySets as values to AddProperty." 2020-09-28 10:06:04 +00:00
Yo Chiang 22fa34d496 Merge "soong: Exclude system shared libs from fix suggestions" am: 19dfeee7d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1433952

Change-Id: I1232d45fd3070b9e888efc713c5359fa07d950dd
2020-09-28 04:13:27 +00:00
Yo Chiang 19dfeee7d5 Merge "soong: Exclude system shared libs from fix suggestions" 2020-09-28 03:54:27 +00:00
Treehugger Robot a8da4bcffa Merge "Support arch-specific init_rc property" am: 85aaf56dd6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1439753

Change-Id: I51400669bab91516a6114b2c154d0bc53851f66e
2020-09-26 02:23:51 +00:00
Treehugger Robot 85aaf56dd6 Merge "Support arch-specific init_rc property" 2020-09-26 02:07:40 +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
Colin Cross d3e05caa47 Don't export flags from SourceProvider variants
There is no need to export the linkdirs from the SourceProvider
variant.  Remove them to reduce differences in build.ninja from
a later patch that moves the flag exporting into compile(), which
isn't called by the SourceProvider variant.

Test: m checkbuild
Change-Id: I9c4d3a336a07cb9074376303bfa277c05d893b98
2020-09-26 00:52:55 +00:00
Colin Cross e4f6ebaf6c Simplify missing whole_static_libs checking
Whole_static_libs required custom error checking when
AllowMissingDependencies was set because it could end up depending
on an empty list of objects, which would leave nothing in the
dependency tree that had been replaced with an ErrorRule.
Reuse the prebuilts case to depend on the .a file when there
are no objects and remove the custom error handling.

Test: TestEmptyWholeStaticLibsAllowMissingDependencies
Change-Id: Ic3216235f7e5ae8b5b6ab31ef2ca35c3994d82aa
2020-09-26 00:52:44 +00:00
Treehugger Robot 4aced67bf0 Merge "Add type information to symbolfile and ndkstubgen." am: 9dd2c4d543
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1347983

Change-Id: Ifbf5c4f37570e8eed573e27ce3ad396c000ea002
2020-09-26 00:13:50 +00:00
Treehugger Robot 9dd2c4d543 Merge "Add type information to symbolfile and ndkstubgen." 2020-09-25 23:59:07 +00:00
Colin Cross 0bab8773cb Support arch-specific init_rc property
Mulitple init_rc files may be necessary to support multilib binaries
with different installed names.

Test: m checkbuild
Change-Id: I17d3a3b2346a25b230e5a325deb0d78f0ee045f0
2020-09-25 14:01:21 -07:00
Ivan Lozano bc9e421215 rust: Allow rust_bindgen to use cc_defaults.
rust_bindgen modules can't inherit properties in cc_defaults that would
be useful for generating bindings (such as cflags). This CL moves these
common properties out into a new struct in cc and adds that struct to
cc_default.

Additionally, Cppflags is added to rust_bindgen to make sure that these
get picked up as well from cc_defaults.

Bug: 163598610
Test: rust_bindgen module uses cflags in cc_defaults.
Test: New Soong test passes
Change-Id: I702442a355244dc01954083f98a2eebbcea12e47
2020-09-25 16:15:26 -04:00
Paul Duffin 6877e6d951 Output Javadoc comments for public API
When generating stubs source for contributions to the public API keep
the Javadoc comments from the input source so that the stubs source can
be used as input to the metalava invocation that creates the stubs from
which the public Javadoc is generated.

This is needed to fix an issue with conscrypt's contributions to the
public API, i.e. SSLEngines and SSLSockets where the Javadoc comments
were not present in the generated Javadoc.

Test: Built offline-sdk-docs with and without the change and
      diffed them. The only difference was the timestamp.js
      file and they now included proper documentation for the
      SSLEngines/SSLSockets classes.
Bug: 169162018
Change-Id: I1b50cff3b91766ce261b2f8e798b77ebc6faac70
2020-09-25 20:23:37 +01:00
Thiébaud Weksteen dba9762aa0 rust: Fix module name in bindgen_test am: e0510d7a69
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1438952

Change-Id: If2a34b8c9e32c20024944ee4af24636f1bd71b3d
2020-09-25 14:17:16 +00:00
Thiébaud Weksteen e0510d7a69 rust: Fix module name in bindgen_test
Test: m nothing
Change-Id: Ifc1dda4433906f3496e86f5b29b7d9ec694d735c
2020-09-25 15:50:09 +02:00
Thiébaud Weksteen 0d862c83ef Merge "Avoid Rust source provider rule duplication" am: 4820c2c8d2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1438332

Change-Id: I9dc8e36980eb687fa07967c9e8cfd230a6e42eee
2020-09-25 13:29:06 +00:00
Ivan Lozano 86ba1e62ef Merge "rust: Add rust_bindgen std version w/ cc defaults." am: ce2cffd583
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1435613

Change-Id: I34955ced21e02ad10b98285d41fb3b58810cb54d
2020-09-25 13:28:30 +00:00
Thiébaud Weksteen 4820c2c8d2 Merge "Avoid Rust source provider rule duplication" 2020-09-25 13:14:01 +00:00
Ivan Lozano ce2cffd583 Merge "rust: Add rust_bindgen std version w/ cc defaults." 2020-09-25 13:11:34 +00:00
Thiébaud Weksteen 295c72bebc Avoid Rust source provider rule duplication
Until now, source provider modules duplicated the rule to generate the
source for each variant. Add a inter-variant dependency between the
source and the other variants (e.g. rlib, dylib) to avoid this
duplication. Add documentation on this behaviour.

Bug: 162588681
Test: m
Change-Id: I41c9e2220f8875245415e17374852e540dfd47ec
2020-09-25 11:36:13 +02:00
Yi Kong 26fb8c32be Merge "Global ThinLTO mode" am: 6a94390d2e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1432912

Change-Id: Ia7b299a83891c0da76e466b41340ddfdb8df9578
2020-09-25 08:50:39 +00:00
Yi Kong 6a94390d2e Merge "Global ThinLTO mode" 2020-09-25 08:36:17 +00:00
Anton Hansson 233d9d7f5e Merge "Make API lint warnings errors for system & testapi" am: a6906e2329
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1437131

Change-Id: I482be558f1959999a13bdbd3cbfb2263610ebe56
2020-09-25 07:08:45 +00:00
Anton Hansson a6906e2329 Merge "Make API lint warnings errors for system & testapi" 2020-09-25 06:52:57 +00:00
Kousik Kumar bad8286a01 Merge "Allow overrides for RBE_log_dir" am: bf30e4d576
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1434973

Change-Id: I5949cd87a5707269d445fd99b50ba6741af428f1
2020-09-25 06:37:42 +00:00
Treehugger Robot 64379b6942 Merge "Switch to armv7 for Rust ARM" am: 985f6295c2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1438051

Change-Id: Ife72b7a3a7d8cb0e7fb2c68e5d9ae9787e94bf10
2020-09-25 06:35:58 +00:00
Kousik Kumar bf30e4d576 Merge "Allow overrides for RBE_log_dir" 2020-09-25 05:40:24 +00:00
Treehugger Robot bbfd7e016a Merge changes I0885e493,Ic37c8db9 am: 4f6eebff0c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1429848

Change-Id: I2d900a72ff809be4d08cf6272864d01a63293c85
2020-09-25 05:25:06 +00:00
Jiyong Park 84d8a7e111 Update the default platform version to S
R is out. The platform codename on the main branch is now S and the API
level of the platform is 30, which is R because S hasn't been finalized.

Bug: N/A
Test: rm -rf out; ./build/soong/soong_ui.bash --make-mode --skip-make
Change-Id: I486b9639bccfe17a42681e1f84097373f8f401e7
2020-09-25 13:47:41 +09:00
Treehugger Robot 985f6295c2 Merge "Switch to armv7 for Rust ARM" 2020-09-25 03:50:41 +00:00
Martin Stjernholm b024957791 Propagate all sanitizer flags in SDK snapshots.
liblog snapshot needs to sanitizer.address=false to avoid cycle in asan
builds. Adding that separately in library_sdk_member.go would start to
feel like whack-a-mole, so the snapshot generation is instead extended
to handle nested property structs.

This uses the BpPropertySet.AddProperty extension in
https://r.android.com/1423510, and common value optimisation now
recurses into non-anonymous structs, instead of comparing them as a
whole.

Test: m nothing
Test: `m SANITIZE_TARGET=address nothing` with prebuilts/runtime
  present in the manifest and a fresh snapshot made with this
Bug: 151303681
Change-Id: I472554117a488e6c800045cb2ed59377778571a4
2020-09-25 00:33:04 +01:00
Martin Stjernholm 191c25f589 Handle property structs and BpPropertySets as values to AddProperty.
Both will create a nested property set, that may be merged with an
existing one.

Test: m nothing
Bug: 151303681
Change-Id: I30696ba3eb8960ca6fa54c9ee2cf6229ab9f5da9
2020-09-25 00:33:04 +01:00
Treehugger Robot 4f6eebff0c Merge changes I0885e493,Ic37c8db9
* changes:
  linux_bionic_arm64 is added when Host_bionic_arm64 is true
  HostCross is an attribute of a Target, not OsType
2020-09-24 22:56:43 +00:00
Matthew Maurer ad64c39442 Switch to armv7 for Rust ARM
In the previous mode, building Rust code using certain intrinsics would
fail on arm32 since our runtime is armv7, but our codegen was arm.

Test: cd external/rust; mma
Bug: 169245712
Change-Id: Ie800486b39325486f5ff319e46632df2a6987391
2020-09-24 14:28:47 -07:00
Dan Albert 587f425a1b Merge changes from topics "soong-apilevel", "soong-config-apilevel" am: 8bd5095362
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1388352

Change-Id: I602df3b8e1d648ca10c4eb04a18125c836995330
2020-09-24 21:26:34 +00:00
Dan Albert d5e15a13df Replace FutureApiLevel with an ApiLevel. am: 0b176c8038
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1388351

Change-Id: I2f73307959278d9bc79301ff1ad7776e55a7d8de
2020-09-24 21:26:30 +00:00
Dan Albert 6e3d089818 Replace ApiStrToNum uses with ApiLevel. am: c8060536e8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1371896

Change-Id: I2fc7571ca37d31f6f9e1a3d5abe8268d13c030d0
2020-09-24 21:25:54 +00:00
Dan Albert af7b36dea5 Add type information to symbolfile and ndkstubgen.
Test: mypy symbolfile
Test: pytest
Bug: None
Change-Id: I6b1045d315e5a10e699d31de9fafc084d82768b2
2020-09-24 14:03:31 -07:00
Dan Albert 8bd5095362 Merge changes from topics "soong-apilevel", "soong-config-apilevel"
* changes:
  Convert more versions in config to ApiLevel.
  Replace FutureApiLevel with an ApiLevel.
  Replace ApiStrToNum uses with ApiLevel.
2020-09-24 21:02:07 +00:00
Yi Kong 93718e0d41 Global ThinLTO mode
Experimental global ThinLTO mode for compilation time evaluation.

Bug: 169004486
Test: GLBOAL_THINLTO=true m
Change-Id: I2ff06397be8b65c7972f1e5f09ab1496949567ee
2020-09-25 02:43:14 +08:00
Treehugger Robot fde70e4d75 Merge "Extend target docs to cover (almost) all variants." am: 2c7ca784f7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1435494

Change-Id: I226e6fe987ee7ab10d6682585576b78c5cff630d
2020-09-24 18:39:23 +00:00
Treehugger Robot 2c7ca784f7 Merge "Extend target docs to cover (almost) all variants." 2020-09-24 18:05:39 +00:00
Ivan Lozano 3d94752b34 rust: Add rust_bindgen std version w/ cc defaults.
Adds the c_std and cpp_std properties to rust_bindgen, and use the
default values from cc if these are undefined.

This assumes by default that the header extension indicates whether
the header is a C or C++ header file. This default can be overridden
by setting either c_std or cpp_std.

Test: Soong tests pass, "-std=" arg included in bindgen calls
Bug: 163580541
Change-Id: I5b0d3b8eae9a54dd91d8a0aca583d7803a344f27
2020-09-24 13:45:09 -04:00
Anton Hansson b30f593da4 Make API lint warnings errors for system & testapi
They used to be listed to not have this treatment, but we are
baselining the existing warnings and making them errors instead.

Bug: 154317059
Test: m
Change-Id: I306b5a07d1b771cc0061aaac44f881f40fbe85ed
Merged-In: I306b5a07d1b771cc0061aaac44f881f40fbe85ed
2020-09-24 13:51:29 +01:00
Yo Chiang 219968c9b3 soong: Exclude system shared libs from fix suggestions
Pass the value of system_shared_libs to the Android.mk world, so that
prebuilt ELF check can exclude them from fix suggestions.

Bug: 141925662
Test: Write a bad cc_prebuilt_library module and check fix suggestions
Change-Id: I0cc61821765507180ce6a582bf8125a192f83a57
2020-09-24 13:18:08 +08:00
Jiyong Park 2210198129 linux_bionic_arm64 is added when Host_bionic_arm64 is true
linux_bionic_arm64 is the new host target using Bionic as libc.  This
change adds a new Soong config Host_bionic_arm64 that enables the
target.

This change also amends firstTarget() function to handle the case when
the available targets for an OS have different arch families. In that
case, first target is selected for each of the arch family. This is
needed in the (rare) care when both linux_bionic_x86_64 and
linux_bionic_arm64 targets are enabled.

Bug: 159685774
Test: add "Host_bionic_arm64": true to out/soong/soong.config and run
./build/soong/soong_ui.bash --make-mode --skip-make
out/soong/host/linux_bionic-arm64/bin/aarch64-linux-bionic/crosvm

Change-Id: I0885e49379f6ee216c6e82adbb1230655171a7a5
2020-09-24 14:14:36 +09:00
Jiyong Park 1613e5541f HostCross is an attribute of a Target, not OsType
A host target is considered as being cross-compiled when the target
can't run natively on the build machine. For example, linux_glibc/x86_64
is a non-cross target on a standard x86/Linux machine, but is a cross
host on Mac. Previously, whether cross or not was a static attribute of
an OsType. For example, Windows was always considered as cross host,
while linux_bionic was not. This becomes a problem when we support more
host targets like linux_bionic/arm64 which should be cross-host on
standard x86/Linux machines.

This change removes HostCross from the OsClass type and instead adds a
property HostCross to the Target type. When a target is being added, it
is initialized to true when the target can't run natively on the current
build machine.

Bug: 168086242
Test: m
Change-Id: Ic37c8db918873ddf324c86b12b5412952b0f2be2
2020-09-24 14:14:31 +09:00
Colin Cross 269cacfd9d Merge "Move PrimaryModule, FinalModule, VisitAllModuleVariants to BaseModuleContext" am: 3735c144e0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1429243

Change-Id: I0f5ba6f62e3a439f12a26d39959eb19456d885de
2020-09-24 01:17:23 +00:00
Colin Cross 3735c144e0 Merge "Move PrimaryModule, FinalModule, VisitAllModuleVariants to BaseModuleContext" 2020-09-24 00:58:24 +00:00
Colin Cross e73994b003 Merge "Add providers support" am: f950513579
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1360942

Change-Id: I5113e018591803a018733f2511507cef59583831
2020-09-24 00:49:49 +00:00