Commit Graph

45749 Commits

Author SHA1 Message Date
Liz Kammer
cc05f6d691 Merge "Make bazel action symlinks absolute paths" am: 17acadbcb0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880827

Change-Id: I108214d19baa07105f922b0a2e3f8b0eeb1eaf0d
2021-11-04 21:28:15 +00:00
Liz Kammer
17acadbcb0 Merge "Make bazel action symlinks absolute paths" 2021-11-04 21:09:21 +00:00
Treehugger Robot
53f0f3e683 Merge "Pass HWASan workarounds cflags to linker as well" am: 51ade343eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880991

Change-Id: I29a6c75b0765770c910625150ccc891564808840
2021-11-04 19:50:00 +00:00
Treehugger Robot
51ade343eb Merge "Pass HWASan workarounds cflags to linker as well" 2021-11-04 19:39:07 +00:00
Trevor Radcliffe
42ec26f2cb Merge "Reformat SDK Library docs" am: 6e9a38ee2a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1881268

Change-Id: Ic0444fb840573e13e65327edcbc5ecb876c9ef61
2021-11-04 19:00:44 +00:00
Trevor Radcliffe
6e9a38ee2a Merge "Reformat SDK Library docs" 2021-11-04 18:41:19 +00:00
Lukács T. Berki
1a39581271 Merge "Fix paths rbc-run uses to access the rbc tools." am: ed7cc80be2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1881272

Change-Id: Ideea12616367650a2efaa405aed55bae5779bc23
2021-11-04 17:28:36 +00:00
Lukács T. Berki
7d48540233 Merge "Bump the bootstrap epoch number." am: a64bd73b18
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1879603

Change-Id: Ic96e8fb7ffdd8f908d4def42e8100d9754e39bab
2021-11-04 17:28:28 +00:00
Lukács T. Berki
ed7cc80be2 Merge "Fix paths rbc-run uses to access the rbc tools." 2021-11-04 17:12:05 +00:00
Lukács T. Berki
a64bd73b18 Merge "Bump the bootstrap epoch number." 2021-11-04 17:10:35 +00:00
Lukacs T. Berki
04bd17ecb9 Fix paths rbc-run uses to access the rbc tools.
This was broken in aosp/1878498; ccross@ submitted aosp/1875758 between
writing that change and submitting it, which changed the paths to mk2rbc
and rbcrun, thereby breaking Starlark product configuration.

Test: Presubmits.
Change-Id: I185489589997e6bdc815a54a8f6f328c18f813d0
2021-11-04 18:02:22 +01:00
Anton Hansson
d88eb89740 Merge "Make PrebuiltStubsSources support srcjar properly" am: c24f0855d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1879682

Change-Id: Iae43c6bbdcd6c5039cb3a978a64b8a9c59b0e23c
2021-11-04 16:47:06 +00:00
Liz Kammer
c773778bfe Make bazel action symlinks absolute paths
hardlinks are incompatible with sandboxing
relative links are incopatible with Soong's use of `cp -d`

Test: build/bazel/ci/mixed_libc.sh
Change-Id: I8c776cda6a27c680c51466d9a7af1b499f2f566d
2021-11-04 12:42:52 -04:00
Anton Hansson
c24f0855d9 Merge "Make PrebuiltStubsSources support srcjar properly" 2021-11-04 16:27:26 +00:00
Lukács T. Berki
53c59a8abb Merge "Remove the out/soong/.bootstrap directory." am: 5a60909cbd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878498

Change-Id: I9925039218ebf3ae496ed14cb0dbbea0d64c8363
2021-11-04 15:22:15 +00:00
Lukács T. Berki
5a60909cbd Merge "Remove the out/soong/.bootstrap directory." 2021-11-04 14:59:12 +00:00
Trevor Radcliffe
df8aa1fbcf Reformat SDK Library docs
We're not sure what formatting is applied to this but it sure
isn't markdown.

Fixes: 204572072
Test: Build and compare docs
Change-Id: Ib023f0cb490a7c7c5605d426ce5e70a7130d5162
2021-11-04 14:39:06 +00:00
Yi Kong
286abc6f17 Pass HWASan workarounds cflags to linker as well
ThinLTO shifts codegen to linking stage. Need to pass the same set of
workaround flags to linker.

Test: m GLOBAL_THINLTO=true; adb shell incident_helper
Bug: 159343917
Bug: 204746309
Change-Id: I1e42bb043d6a86d880054b85e8831386ae4ea7e5
2021-11-04 20:19:57 +08:00
Treehugger Robot
13b567905a Merge "Dedup logic for selecting system modules" am: 9f76be59f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880030

Change-Id: I38976dd90a86313150bf4027dc3cdc1eec49343d
2021-11-04 11:49:34 +00:00
Treehugger Robot
9f76be59f1 Merge "Dedup logic for selecting system modules" 2021-11-04 11:35:25 +00:00
Lukacs T. Berki
9985d9a3a5 Bump the bootstrap epoch number.
The bpglob changes in build/blueprint submitted together with this
change make it necessary.

Test: Presubmits.
Change-Id: I3d19761ec1a199c2f77693a882f8744ce404c6de
2021-11-04 11:47:42 +01:00
Lukacs T. Berki
90b4334a64 Remove the out/soong/.bootstrap directory.
It's better not to have state hidden in dotfiles (or rather,
dotdirectories) if we can help.

It's questionable whether the "linux-x86" path segment makes sense since
soong_build only ever runs on one operating system, but I didn't want to
rock the boat now.

Drive-by fixed some quoting fixes in rbc-run. Notably, I didn't wrap
`$@` into double quotes because I don't know whether the lack of double
quotes was intended or not.

Also drive-by fixed the fact that "out/soong" was added twice to the
directory name of bpglob. This turned out not to be a problem because
bpglob doesn't need to be explicitly built: if it's needed, it's
declared as an input of the glob files so it'll be built automatically
(at the cost of the first "null build" not actually being a null build)

Test: Presubmits.
Change-Id: I710d8d16cd8212059a0ca1ee95378505303eed83
2021-11-04 09:47:58 +01:00
Paul Duffin
9cf5708c2c Merge "Rename core-current-stubs-system-modules to be more consistent" am: 9de51af72c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880029

Change-Id: Ib962470b0a50d5efd781b26d1b24f719cb5e1396
2021-11-03 18:47:39 +00:00
Treehugger Robot
f447825a3e Merge "Convert .meta_lic files to textproto" am: c37663aad9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1866113

Change-Id: I689b2ed80cc5a8477e3884fe5bb2a15af1b1711e
2021-11-03 18:47:10 +00:00
Paul Duffin
e5ad90c37b Dedup logic for selecting system modules
Previously, the selection of system modules was duplicated, once for
source and once for prebuilts. This change dedups that by switching the
source code to use the same mechanism as the prebuilts which will ensure
consistent behavior in future.

Bug: 204189791
Test: m	nothing
Change-Id: Ia1729017ae332181c95f7b205dab87fb47d43fb8
2021-11-03 18:44:45 +00:00
Paul Duffin
9de51af72c Merge "Rename core-current-stubs-system-modules to be more consistent" 2021-11-03 18:43:50 +00:00
Treehugger Robot
c37663aad9 Merge "Convert .meta_lic files to textproto" 2021-11-03 18:31:02 +00:00
Paul Duffin
10fb76f467 Rename core-current-stubs-system-modules to be more consistent
Renames to core-public-stubs-system-modules so that it is of the format
core-<sdk-kind>-stubs-system-modules.

Bug: 204189791
Test: m nothing
Change-Id: Iac565c940c2ef92be9cc64c0c6b8102a26afe0dd
2021-11-03 16:58:29 +00:00
Anton Hansson
86758ac94c Make PrebuiltStubsSources support srcjar properly
Initially prebuilt stub sources only supported directories as input, but
support has been added for packaging them up in srcjar as well. However
the build action was not updated accordingly.

Add support to determine if our input is a srcjar, and if so just use
it directly.

Bug: 204978699
Test: m sdk (with prebuilts)
Change-Id: I302cd34ebd55414d35c4f936cd563a4af89b22c6
2021-11-03 15:59:30 +00:00
Treehugger Robot
62539c2872 Merge changes Id11f4fb1,Id573d970,Ia94a0b5c am: a3bd963988
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878086

Change-Id: Ia4ae8723342e8114b25326c5259065be32d32c58
2021-11-03 15:52:54 +00:00
Paul Duffin
f7b8ad3546 Merge "Use module-lib system modules when building from prebuilts" am: 8380ee66a5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1877320

Change-Id: I8af375d9536c11912ed31bf589a6c8990d072c16
2021-11-03 15:52:46 +00:00
Treehugger Robot
a3bd963988 Merge changes Id11f4fb1,Id573d970,Ia94a0b5c
* changes:
  Fix //conditions:default excludes computation for LabelListAttribute.
  bp2build: split Bazel conversion context into smaller ones, and change TopDownMutatorContext signatures to use Bazel conversion context.
  Add an error check in `bazelPackage` for malformed labels.
2021-11-03 15:36:28 +00:00
Paul Duffin
8380ee66a5 Merge "Use module-lib system modules when building from prebuilts" 2021-11-03 15:32:42 +00:00
Liz Kammer
ae5a9f4d14 Merge "Update bp2build denylist cause" am: 5506c1658c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878026

Change-Id: If2e448bcbdfdad76b8c2103a480b12d166a25b7f
2021-11-03 14:34:21 +00:00
Liz Kammer
5506c1658c Merge "Update bp2build denylist cause" 2021-11-03 14:19:16 +00:00
Treehugger Robot
fbf70371b2 Merge "Revert "Fix python_binary_host module in mixed build."" am: ed078675d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1879357

Change-Id: Ie91b6ee18f09c954e650f8a2e054a590d851a5c1
2021-11-03 11:19:18 +00:00
Treehugger Robot
ed078675d0 Merge "Revert "Fix python_binary_host module in mixed build."" 2021-11-03 11:05:58 +00:00
Rupert Shuttleworth
ffc4cc41a3 Revert "Fix python_binary_host module in mixed build."
Revert submission 1861755-fix_python_binary_host_in_mixed_build

Reason for revert: Broke Bazel CI, please see https://android-build.googleplex.com/builds/submitted/7879108/mixed_droid-clean/latest/view/logs/build_error.log and https://android-build.googleplex.com/builds/submitted/7879108/mixed_droid-incremental/latest/view/logs/build_error.log
Reverted Changes:
Ica457ee71:Add platform needed by python_binary_host.
Ibc8b99a92:Fix python_binary_host module in mixed build.

Change-Id: I3d6c4f6edee2d00bdc78efd5cee64f4c915baeaa
2021-11-03 09:07:26 +00:00
Lukács T. Berki
64578d5b13 Merge "Update debugging instructions." am: c2fc91e52b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1841374

Change-Id: I62fa4a63cb0ceef8eff68ae80d5edfbb7729bf6f
2021-11-03 08:03:51 +00:00
Lukács T. Berki
c2fc91e52b Merge "Update debugging instructions." 2021-11-03 07:48:39 +00:00
Wei Li
e18517bc25 Keep the following targets disabled in mixed build since there are errors in mixed_droid CI after go/oag/1861755 is submitted. am: c989eaf4c3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1879178

Change-Id: I52c7119e81135f4b6295c2f18e2c2975d77a220c
2021-11-03 05:12:43 +00:00
Wei Li
c989eaf4c3 Keep the following targets disabled in mixed build since there are errors in mixed_droid CI after go/oag/1861755 is submitted.
func_to_syscall_nrs
libseccomp_policy_app_zygote_sources
libseccomp_policy_app_sources
libseccomp_policy_system_sources

Test: CI
Bug: 204949078

Change-Id: Iaf9d7cd8831da984bcee82399be138ebe3aab9e8
2021-11-03 04:15:36 +00:00
Jingwen Chen
9af49a49f8 Fix //conditions:default excludes computation for LabelListAttribute.
Previously, excludes computation for the default condition in label list
selects was clobbering pre-existing values. This CL fixes it by
performing a union of the new values with existing ones instead.

Test: properties_test.go
Bug: 198556411
Change-Id: Id11f4fb14e359201304afde0d8ba856851d41395
2021-11-03 01:56:42 +00:00
Colin Cross
d04190d6fb Merge "Move bpglob out of ToolDir" am: fe8ceadabf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1875758

Change-Id: Idc2b87b2b0dc0a8e4c682d0007d346bfa9c2a69e
2021-11-02 21:06:54 +00:00
Colin Cross
fe8ceadabf Merge "Move bpglob out of ToolDir" 2021-11-02 20:50:26 +00:00
Liz Kammer
b84b8c9c9a Update bp2build denylist cause
The binary is converted; however, there are still issues with the host
toolchain.

Test: build/bazel/ci/bp2build.sh
Change-Id: Idf864ea6c64c0c7bbbaa0c9d43d6eac5120e0268
2021-11-02 15:03:12 -04:00
Wei Li
f214e0730f Fix python_binary_host module in mixed build. am: 664a4fd0af
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1861755

Change-Id: I6d58352099ad262baf820b5fffb6c231665b562b
2021-11-02 17:25:17 +00:00
Wei Li
664a4fd0af Fix python_binary_host module in mixed build.
Test: USE_BAZEL_ANALYSIS=1 m genfunctosyscallnrs
Test: USE_BAZEL_ANALYSIS=1 m func_to_syscall_nrs
Test: USE_BAZEL_ANALYSIS=1 m libseccomp_policy
Bug: 201094425, 197135289

Change-Id: Ibc8b99a92149410c8a879b7a4facf6c8961a7b9f
2021-11-02 17:04:38 +00:00
Colin Cross
9191df23df Move bpglob out of ToolDir
ToolDir is going to become unstable when switching between KatiEnabled
and Soong-only builds while the duplication between out/soong/host and
out/host is resolved.  bpglob gets executed very early during bootstrap,
before the primary builder has run to update the paths to match the
current configuration.  Move it into SoongOutDir() so that its path
is more stable.

Moving bpglob causes incremental build issues, so add a bootstrapEpoch
constant that can be changed when making incompatible changes and will
wipe bootstrap intermediates.

Bug: 204136549
Test: m nothing
Change-Id: I7b1bd1ebfe1209d11db691b3ee00873ef92658cd
2021-11-02 15:30:36 +00:00
Ivan Lozano
9729b0a9ed Merge changes I2373d366,I908496d9 am: c7a4de25c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1877337

Change-Id: Id7cf46fe0e98bf51d2e3a9364513d64f18e09466
2021-11-02 12:52:15 +00:00