Commit Graph

36852 Commits

Author SHA1 Message Date
Colin Cross
75decc4e97 Merge changes from topic "host_bionic_no_inject" am: f77d3804fc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1735341

Change-Id: Ie55dfa7dacf0d27e2dd2a6916c60211c5fb02344
2021-06-16 17:05:01 +00:00
Colin Cross
dc6e968a3f Stop injecting symbols into host bionic binaries am: f04eb99acc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1735453

Change-Id: Iad472fd7acfca99e5da994429fb62a66c1d6b719
2021-06-16 17:03:59 +00:00
Colin Cross
f77d3804fc Merge changes from topic "host_bionic_no_inject"
* changes:
  Give extracted linker sections pretty names
  Stop injecting symbols into host bionic binaries
2021-06-16 16:50:05 +00:00
Jingwen Chen
b93952e849 Merge "Make SharedLibraryInfo comment clearer." am: d51502d238
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736516

Change-Id: I013330dd3d54b7468828d0b6ce4a216a83ecc714
2021-06-16 12:14:30 +00:00
Jingwen Chen
d51502d238 Merge "Make SharedLibraryInfo comment clearer." 2021-06-16 12:01:21 +00:00
Jingwen Chen
7fc226d257 bp2build: group shared/static attrs into a struct. am: c4dc9b4f08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1733748

Change-Id: I0e9616eb608efdb08ae51da51c04a85e39aca424
2021-06-16 07:18:42 +00:00
Jingwen Chen
c4dc9b4f08 bp2build: group shared/static attrs into a struct.
This makes bp2build generate these attrs into a Starlark dictionary,
passed into the cc_library macro directly. This makes the BUILD target
representation more similar to the Android.bp one, and also makes
it more legible.

Test: TH
Change-Id: I42b427cc4b22c6376d3d24e40b9af1692bb0c692
2021-06-16 05:40:37 +00:00
Jingwen Chen
702963e74d Make SharedLibraryInfo comment clearer.
Nit from aosp/1727935

Test: TH
Change-Id: I4cf6d63fb3b1f0bd1762d5e4ea261aa8f5a4b580
2021-06-15 23:44:13 +00:00
Treehugger Robot
ffa60aa20f Merge changes I0aee679a,I7fb380a3 am: 3420b834d8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1728214

Change-Id: I68ad5c8402ea94f4cadd23102cb51cc5a172d5f2
2021-06-15 23:16:58 +00:00
Treehugger Robot
3420b834d8 Merge changes I0aee679a,I7fb380a3
* changes:
  Add systemapi as an APEX synonym for stub maps.
  Refactor tag handling code in stub generator.
2021-06-15 22:59:10 +00:00
Treehugger Robot
d4bca70a75 Merge "Don't enforce ordering for ABI validation." am: 45d7289e7c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1737316

Change-Id: I6c660e138d7036a19f2974c0db2d3b675f33c9a1
2021-06-15 22:04:55 +00:00
Treehugger Robot
45d7289e7c Merge "Don't enforce ordering for ABI validation." 2021-06-15 21:41:57 +00:00
Pirama Arumuga Nainar
9375585937 Merge "Mark more fields in BaseLinkerProperties as arch variant" am: f9d141ee9a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1737314

Change-Id: I34ca0cf872b0655a5e305942946c02a360eeca08
2021-06-15 21:29:55 +00:00
Pirama Arumuga Nainar
f9d141ee9a Merge "Mark more fields in BaseLinkerProperties as arch variant" 2021-06-15 21:14:14 +00:00
Dan Albert
4922703e86 Don't enforce ordering for ABI validation.
We care that these run, but they don't need to complete before we use
the sysroot.

Test: mm in CTS, saw ABI dump run
Bug: None
Change-Id: Iff1961d1ff03430d808caa83b3ca1fc1eceecfcd
2021-06-15 13:26:55 -07:00
Spandan Das
875ab39271 Merge "Bootstrap empty glob file" am: 7e81e1efbc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1735978

Change-Id: I551d19fb1e5cfaf3973e354e86691e7728abf07e
2021-06-15 19:46:19 +00:00
Spandan Das
7e81e1efbc Merge "Bootstrap empty glob file" 2021-06-15 19:23:48 +00:00
Pirama Arumuga Nainar
250c5217a2 Mark more fields in BaseLinkerProperties as arch variant
Bug: http://b/189438896

This allows setting a different version script for vendor and
platform variants.

Test: The following blueprint snippet builds:
      target: { android_arm64: {
        target: vendor: {
            version_script: "..." } } }
Change-Id: I47e7afeaee3c9124f4231bf0eece7b6844b5313d
2021-06-15 11:03:48 -07:00
Spandan Das
8f99ae6bc0 Bootstrap empty glob file
1. Initialize an empty glob file for .bootstrap/build.ninja. Initializing
in soong_ui (and not soong_build) prevents inadvertently creating the
file inside the source tree
2. Remove soong-build-globs.ninja, which is not used during the build

Bug: 187194795
Test: Ran the following command locally for the target
art-target-arm:git_master-art
```
. ./build/envsetup.sh && lunch armv8-eng &&
art/tools/buildbot-build.sh --target
```

Change-Id: Ibe6eeff65ea1ab25136642299e9878d0da1cac42
2021-06-15 17:50:46 +00:00
Lukács T. Berki
4c8d04dcf5 Merge "Update some comments about the image mutator." am: 84a1601804
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1737526

Change-Id: If26c2b2f3a91801db45d5439aed6dcd53c7edee1
2021-06-15 16:33:42 +00:00
Lukács T. Berki
84a1601804 Merge "Update some comments about the image mutator." 2021-06-15 15:50:11 +00:00
Chris Parsons
e6819aa944 Support cc_library_shared for mixed builds am: 94a0bba5a9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1727935

Change-Id: I278a624b027540e5a637d982785d57fd0f4cef36
2021-06-15 15:13:31 +00:00
Lukacs T. Berki
2f5c340b49 Update some comments about the image mutator.
Test: It's just comment changes.
Change-Id: Idac69f5369caad028f3daa6aa5c1088d697c07e2
2021-06-15 15:49:51 +02:00
Chris Parsons
94a0bba5a9 Support cc_library_shared for mixed builds
Authors: cparsons, eakammer, jingwen

This CL also contains .toc file integration between Bazel and Make.

Fixes: b/190524879

Test: build/bazel/ci/mixed_droid.sh

Co-authored-by: Christopher Parsons <cparsons@google.com>
Co-authored-by: Liz Kammer <eakammer@google.com>
Co-authored-by: Jingwen Chen <jingwen@google.com>

Change-Id: If484042a58cb9f0db6d30a460f415f5684b4cbf6
2021-06-15 12:40:28 +00:00
Treehugger Robot
a7496dbf4c Merge "Wrapper script to use Starlark-based configuration" am: 79e04280ba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736354

Change-Id: I9ac44b1be88debb9d9f50bcef5b619b7230788a8
2021-06-15 06:08:01 +00:00
Treehugger Robot
79e04280ba Merge "Wrapper script to use Starlark-based configuration" 2021-06-15 05:52:34 +00:00
Treehugger Robot
e7e443b820 Merge "Add a build flag to always enable errorprone per-target" am: 768692bc69
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1735975

Change-Id: I7fc8b462d0a8b504e3aa4066c9e27fb158483851
2021-06-15 00:50:29 +00:00
Treehugger Robot
768692bc69 Merge "Add a build flag to always enable errorprone per-target" 2021-06-15 00:32:41 +00:00
Sasha Smundak
a3be792b10 Wrapper script to use Starlark-based configuration
Test: manual
Bug: 181797530
Change-Id: I51edea16982386a1022c77ddd282e95b2c5d77a2
2021-06-14 15:52:08 -07:00
Cole Faust
75fffb14b8 Add a build flag to always enable errorprone per-target
Currently, errorprone is only run if the RUN_ERROR_PRONE
enviornment variable is true. Add a flag that individual
modules can use to always enable errorprone.

In a followup cl, I plan to add another flag that will
force all errorprone checks to be errors, so that modules
can be confident that they're not ignoring any errorprone
checks.

Bug: 190944875
Test: New unit test and manually
Change-Id: Iab0c81642ed22a736add054147829e91a891d179
2021-06-14 15:31:32 -07:00
Paul Duffin
e63e0cc94e Merge "Avoid passing around []hiddenAPIModule" am: 881baf5573
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736224

Change-Id: Ia794359e5a581d6b8b705d213eb17fae51454504
2021-06-14 22:19:04 +00:00
Paul Duffin
881baf5573 Merge "Avoid passing around []hiddenAPIModule" 2021-06-14 22:02:42 +00:00
Nikita Ioffe
571a72a46b Merge "Rename test_only_no_hashtree to generate_hashtree" am: 5868ba016d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1734152

Change-Id: I475c6159f198a84cd6b31b888b99567a7c32ec8a
2021-06-14 20:22:42 +00:00
Paul Duffin
d0a7be3222 Improve error reporting when a rule cannot be found am: 4dbf6cfbae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736223

Change-Id: Ida5552db4748838406f41d66f101aff1a7b3443c
2021-06-14 20:20:22 +00:00
Nikita Ioffe
5868ba016d Merge "Rename test_only_no_hashtree to generate_hashtree" 2021-06-14 20:16:21 +00:00
Paul Duffin
dd5993f6d4 Avoid passing around []hiddenAPIModule
Previously, an []android.Module was converted to an []hiddenAPIModule
that was then used to retrieve boot dex jars. That was ok when
obtaining the dex jar files from source modules for
bootclasspath_fragment but does not work well for other use cases as
it would require doing that conversion in multiple places.

This change pushes the use of hiddenAPIModule down to the methods that
retrieve information from it which makes the methods more flexible and
easier to reuse.

Bug: 177892522
Test: m nothing
Change-Id: Ib84aaf03d8f5a63b48232036fe4589646fc23352
2021-06-14 17:23:52 +01:00
Paul Duffin
4dbf6cfbae Improve error reporting when a rule cannot be found
Outputs the list of available rules on separate lines.

Test: m nothing
Change-Id: I845064e032f0a47d00883ff775c4f7b4fee7631e
2021-06-14 17:23:52 +01:00
Paul Duffin
174d9c7eec Merge "Make copyBootJarsToPredefinedLocations simpler and less fragile" am: cc1bd8364a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1731414

Change-Id: If96e0287db7e2ef86fb12f14f278dc669bf9682d
2021-06-14 08:24:53 +00:00
Paul Duffin
cc1bd8364a Merge "Make copyBootJarsToPredefinedLocations simpler and less fragile" 2021-06-14 08:20:50 +00:00
Paul Duffin
87cbe1b100 Merge "Ensure primary boot image files are created before they are used" am: a11b8707f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1731413

Change-Id: I4d5c86d67488e8892ccf0c7237177040448703ef
2021-06-14 08:19:18 +00:00
Paul Duffin
a11b8707f1 Merge "Ensure primary boot image files are created before they are used" 2021-06-14 08:01:27 +00:00
Colin Cross
009f3df380 Give extracted linker sections pretty names
Replace .linker.sect0, etc. with .linker, .linker.text, .linker.data
and .linker.data.rel.ro by extracting the name of the first section
in each program header.

Test: build and run host bionic binary
Change-Id: I25107547536a3a3963fdeb311c45a7ee53c0bc45
2021-06-11 17:57:09 -07:00
Colin Cross
f04eb99acc Stop injecting symbols into host bionic binaries
The host bionic bootstrapping no longer needs an injected symbol.
Replace host_bionic_inject with host_bionic_verify that validates
the resulting binary, and add it as a validation dependency of the
binary.

Test: build and run host bionic binary
Change-Id: I3e303d2a164b6eef851bdc8075e6ee456c05b0a8
2021-06-11 15:22:41 -07:00
Liz Kammer
e684a554ca Merge "Append _alwayslink to prebuilt whole static deps" am: 5f16b3d03e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1734255

Change-Id: I59610a5c0a4df44f2f736bc5267c8e8b191d07fa
2021-06-11 19:59:09 +00:00
Liz Kammer
5f16b3d03e Merge "Append _alwayslink to prebuilt whole static deps" 2021-06-11 19:47:12 +00:00
Liz Kammer
2d7bbe3883 Append _alwayslink to prebuilt whole static deps
This allows us to support prebuilt archives that are part of whole
static deps.

Test: build/bazel/ci/bp2build.sh
Bug: 190716727

Change-Id: I913dbd8f85a1974fbd53c0cbaa49211db18ea45f
2021-06-11 08:10:50 -04:00
Paul Duffin
c279ca845c Merge "Make bootclasspath_fragment_sdk_test.go tests more realistic" am: 4ebad6aa89
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1731419

Change-Id: Idef290f1cfafc8fea10760dc1da87c1e9658b8ad
2021-06-11 04:50:45 +00:00
Paul Duffin
e599574c92 Merge "Make TestPlatformBootclasspath_Fragments more realistic" am: baa8e55dec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1731417

Change-Id: Ie932deddef1bd9bf181c26278a4fd8482a750514
2021-06-11 04:50:38 +00:00
Paul Duffin
0d2a3ad17d Merge "Move TestPlatformBootclasspath_Fragments to apex package" am: 2eddb50fd5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1731416

Change-Id: Ia1f9004d5f214aff94012f95dcaaa840a4babac9
2021-06-11 04:50:29 +00:00
Paul Duffin
a6752bb7ed Merge "Export hidden api related types and fields" am: 5e1073b7cd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1731415

Change-Id: I3a24d55d95460bbebb7378411d8b5d449ffce628
2021-06-11 04:49:38 +00:00