StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,175 Commits 1 Branch 0 Tags
f3d901b71d0f768e30233d74feca0332308d917d
Commit Graph

46175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lukács T. Berki
f3d901b71d Merge "Fix paths rbc-run uses to access the rbc tools." am: ed7cc80be2 am: 1a39581271 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1881272

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

Change-Id: Ifbb80bdfc44c002913cef06c4745a2e31db24f1c
 2021-11-04 17:48:15 +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
Anton Hansson
ddcc6bfcc9 Merge "Make PrebuiltStubsSources support srcjar properly" am: c24f0855d9 am: d88eb89740 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1879682

Change-Id: Iffe1b469d1c8c91aeddca775825cfbb610d37c47
 2021-11-04 17:05:38 +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
Anton Hansson
c24f0855d9 Merge "Make PrebuiltStubsSources support srcjar properly" 2021-11-04 16:27:26 +00:00
Lukács T. Berki
7c494177ee Merge "Remove the out/soong/.bootstrap directory." am: 5a60909cbd am: 53c59a8abb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878498

Change-Id: Id41dc693250ab841251802caf25b67aea4fc7e65
 2021-11-04 15:36:09 +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
Treehugger Robot
43b4dda231 Merge "Dedup logic for selecting system modules" am: 9f76be59f1 am: 13b567905a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880030

Change-Id: Ibe9dbeadaf0a03a88146182a951260a59c8c4ce7
 2021-11-04 12:02:38 +00: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
e7087fd0b4 Merge "Rename core-current-stubs-system-modules to be more consistent" am: 9de51af72c am: 9cf5708c2c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880029

Change-Id: I498c06cc77c6b926979af19bbf404c9d0d629cb8
 2021-11-03 19:13:59 +00:00
Treehugger Robot
c17562e703 Merge "Convert .meta_lic files to textproto" am: c37663aad9 am: f447825a3e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1866113

Change-Id: I3810dd8ed0848e3e0d2f4b72f6881668b42182b7
 2021-11-03 19:13:49 +00: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
Treehugger Robot
3fe1cc8006 Merge changes Id11f4fb1,Id573d970,Ia94a0b5c am: a3bd963988 am: 62539c2872 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878086

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

Change-Id: I62e3728458500ce6caa5930a95e5eb2cb749fe07
 2021-11-03 16:12:57 +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
1476238b34 Merge "Update bp2build denylist cause" am: 5506c1658c am: ae5a9f4d14 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878026

Change-Id: I5e8ec020332eef9c862e6aab7dafd1d26d2cb221
 2021-11-03 14:46:08 +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
a9f0781bce Merge "Revert "Fix python_binary_host module in mixed build."" am: ed078675d0 am: fbf70371b2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1879357

Change-Id: I1a7c48950326d56f4c2194950971c61f172e188c
 2021-11-03 11:30:54 +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
2e7bc8ddec Merge "Update debugging instructions." am: c2fc91e52b am: 64578d5b13 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1841374

Change-Id: I493c87bce2787a15bb8e29536ab662da60113778
 2021-11-03 08:15:25 +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
bedc6ecdc8 Keep the following targets disabled in mixed build since there are errors in mixed_droid CI after go/oag/1861755 is submitted. am: c989eaf4c3 am: e18517bc25 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1879178

Change-Id: I425420a5635f63261e0baac02476066b2c4d8c9b
 2021-11-03 05:24:13 +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
698b12820d Merge "Move bpglob out of ToolDir" am: fe8ceadabf am: d04190d6fb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1875758

Change-Id: I96498694618a86d42b3306ed8816a0d570d558e3
 2021-11-02 21:23:11 +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