StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,539 Commits 1 Branch 0 Tags
550ed75031fc8e226e95ca58a3497ab901b1aa9f
Commit Graph

3503 Commits

Author SHA1 Message Date
Christopher Parsons
6787777e06 Merge "bp2build: handle system_shared_libs" am: 67d6ccecfc am: 430c7d2c53 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1783210

Change-Id: I7406a36873b6dc626cf89ceab6aa15d4aa05368c
 2021-08-09 19:41:50 +00:00
Christopher Parsons
67d6ccecfc Merge "bp2build: handle system_shared_libs" 2021-08-09 19:11:00 +00:00
Chris Parsons
51f8c39261 bp2build: handle system_shared_libs 
- If no system_shared_libs is specified, bp2build writes no attribute
value. In this case, the bazel library macros determine the correct
default behavior.
- If any system_shared_libs is specified for any variant, then bp2build
writes the value verbatim. This includes if an empty list is specified,
as this should override defaulting behavior.

Note this defaulting behavior is incomplete and will be incorrect in
corner cases. For example, if, in an Android.bp, system_shared_libs is
specified for os.linux_bionic but not for os.android, then the bazel
default for os.android will be incorrect. However, there are no current
modules in AOSP which fit this case.

As a related fix, supports static struct for cc_library_static.

Also, removes some elements from the bp2build denylist.

Test: mixed_droid CI
Change-Id: Iee5feeaaf05e8e7209c7a90c913173832ad7bf91
 2021-08-09 11:41:09 -04:00
Christian Wailes
8e11a903a9 Merge "Conditionally apply rustdoc flags to third party crates" am: 99bc67a548 am: d793c89474 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1783747

Change-Id: Id56a4a5dd2d8259d6a0d666e403238759885d570
 2021-08-03 20:18:47 +00:00
Christian Wailes
99bc67a548 Merge "Conditionally apply rustdoc flags to third party crates" 2021-08-03 19:39:17 +00:00
Romain Jobredeaux
3f9143d654 Merge "Add prebuilts/r8 to the bp2build BUILD file overwriting exception list." am: 596a78949c am: 9a4c0e8b2d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1784648

Change-Id: Iba921d63aab7fd476dab22e4df0a072cefae6c26
 2021-08-03 16:44:25 +00:00
Romain Jobredeaux
596a78949c Merge "Add prebuilts/r8 to the bp2build BUILD file overwriting exception list." 2021-08-03 16:07:16 +00:00
Chris Wailes
b2703adce4 Conditionally apply rustdoc flags to third party crates 
This CL changes the logic in rust/builder.go so that some rustdoc flags
are only applied to external crates.  This will allow us to since
warnings and deal with soft-failures in external crates while allowing
us to be more strict with our internal Rust code.

Bug: 195136952
Test: m rustdoc
Change-Id: Icdde304bbbb323cae9657e8f842f58ae79e811ce
 2021-08-02 11:50:34 -07:00
Romain Jobredeaux
8c98c25f07 Add prebuilts/r8 to the bp2build BUILD file overwriting exception list. 
Change-Id: I241d5e9a1bf1269a033d1f7c58e851610105c7fa
Test: b build prebuilts/r8:r8_jar_import
Bug: 194103854
 2021-08-02 17:53:24 +00:00
Liz Kammer
30d5558a49 Merge "Set mixed builds use product-config based target" am: 93f51a3cff am: 460f522f79 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778965

Change-Id: Id084be14766122dd970c2db91067a27128289626
 2021-08-02 16:59:16 +00:00
Liz Kammer
93f51a3cff Merge "Set mixed builds use product-config based target" 2021-08-02 16:38:29 +00:00
Yi-Yo Chiang
e2027b2526 Merge changes from topic "variational-required" am: d7b95f94a1 am: e3c9611b24 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1739833

Change-Id: I00420ba0a1409254125935e8c1a4c3610fa44536
 2021-07-30 18:35:25 +00:00
Dan Willemsen
ab1becc9ee Merge commit 'f42f01b49d3e3d28ef2b0ae8f90cacd6f2b36ce2' into stage-aosp-master am: bafb547656 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15430191

Change-Id: I87c4c9b0237a8665101cfaeb157872657516ea3e
 2021-07-30 18:35:08 +00:00
Yi-Yo Chiang
d7b95f94a1 Merge changes from topic "variational-required" 
* changes:
  cc/cc.go: Support per-image-variation "required"
  android/androidmk.go: Calls *RequiredModuleNames() to get required modules
 2021-07-30 10:09:40 +00:00
Dan Willemsen
f42f01b49d Merge "Upgrade to golang protobuf api v2" 2021-07-29 18:29:26 +00:00
Jingwen Chen
fad8382357 Merge "Add tzdata packages to bp2build allowlist." am: 2181be3a25 am: a60ff22cf4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1779761

Change-Id: I164d2517e6b5f5e50463589acbe0237e91f123bb
 2021-07-29 01:46:24 +00:00
Jingwen Chen
739d01e5ef Add tzdata packages to bp2build allowlist. 
Test: bp2build CI

Test: Build tzdata APEX with Bazel

Bug: 194644492
Change-Id: I05854f5f7dceeb197c1b7d8e746eb6fc07d93581
 2021-07-28 15:26:20 +00:00
Jooyung Han
4addd28972 Merge "TransitivePackagingSpecs should follow "installable" deps" am: 1c534d3c73 am: ff29971e2c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1775265

Change-Id: I5726dc30e60bc0d08d6699ff1a91ac5186d4c01c
 2021-07-28 01:05:59 +00:00
Jooyung Han
1c534d3c73 Merge "TransitivePackagingSpecs should follow "installable" deps" 2021-07-28 00:35:16 +00:00
Rupert Shuttleworth
d0ec532fa6 Add some more properties to the bp2build APEX converter (second try) am: 6e4950a061 am: 6de2c9b72b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778212

Change-Id: Ic13b56e93a31357887d37c21952d5a2fe8d85d87
 2021-07-27 10:57:03 +00:00
Jooyung Han
8707cd74bf TransitivePackagingSpecs should follow "installable" deps 
Gathering packaging items from "SkipInstall" deps doesn't make sense.

Bug: 194403710
Test: soong test
Test: m microdroid # microdroid shouldn't have libandroidicu
Change-Id: If6c3ee82d588e2742c85cef7244c090c93f38b8e
 2021-07-27 19:26:10 +09:00
Rupert Shuttleworth
6e4950a061 Add some more properties to the bp2build APEX converter (second try) 
In particular:

- AndroidManifest
- file_contexts
- key
- certificate
- min_sdk_version
- updatable
- installable
- native_shared_libs
- binaries

Test: Updated unit test

Change-Id: I1c6e8c4b6b24ce487f64e5d37bd594dbb000fe6f
 2021-07-27 05:02:50 -04:00
Rupert Shuttleworth
53b662e2f3 Merge "Revert "Add some more properties to the bp2build APEX converter."" am: d0e6ad1ab3 am: 8ed074029d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778407

Change-Id: I732ad6808d71b32642fb5892387a6500c31af9d3
 2021-07-27 03:25:29 +00:00
Treehugger Robot
b97add46c7 Merge "Add some more properties to the bp2build APEX converter." am: 57dd3c40e8 am: 23c45bb446 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778085

Change-Id: I7274c07caeee96306b69172793a9c9699839b35b
 2021-07-27 03:02:43 +00:00
Rupert Shuttleworth
d0e6ad1ab3 Merge "Revert "Add some more properties to the bp2build APEX converter."" 2021-07-27 02:56:56 +00:00
Rupert Shuttleworth
0358478150 Revert "Add some more properties to the bp2build APEX converter." 
This reverts commit 69bf4c0d60.

Reason for revert: Possibly broke CI (https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master-bazel&target=bp2build-incremental&lkgb=7266256&fkbb=7237028), rolling back just in case...

Change-Id: I14ebac4f47576a73285d1f724ae4499036e8e678
 2021-07-27 02:37:32 +00:00
Treehugger Robot
57dd3c40e8 Merge "Add some more properties to the bp2build APEX converter." 2021-07-27 02:17:51 +00:00
Liz Kammer
c0c6609ef6 Set mixed builds use product-config based target 
Rather than specifying a specific arch/os, use the android_target
platform that incorporates arch/os based on product config.

Test: build/bazel/ci/mixed_libc.sh
Change-Id: I2b30cfb9778444acbfd7648af2d331303cab416a
 2021-07-26 17:41:49 -04:00
satayev
ad6cb082a4 Merge "Rename UpdatableBootJars to ApexBootJars." am: 4102c0cc47 am: adb9e9f752 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1773912

Change-Id: Iecc5f48620b2d4e5390ab9a081b2193924bd0dda
 2021-07-26 18:29:56 +00:00
satayev
4102c0cc47 Merge "Rename UpdatableBootJars to ApexBootJars." 2021-07-26 17:59:36 +00:00
Jingwen Chen
7651e9ae8a bp2build BUILD files for build/bazel/examples/apex. am: b643c7a085 am: ccce36b584 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1777787

Change-Id: I89d63e700cd68a230fcd5f20381afa0684938c8f
 2021-07-26 12:12:51 +00:00
Rupert Shuttleworth
69bf4c0d60 Add some more properties to the bp2build APEX converter. 
In particular:

- AndroidManifest
- file_contexts
- key
- certificate
- min_sdk_version
- updatable
- installable
- native_shared_libs
- binaries

Test: Updated unit test

Change-Id: I9ea13f021d63ec0f75006b3b0b23ec8178c7e9da
 2021-07-26 07:32:36 -04:00
Jingwen Chen
b643c7a085 bp2build BUILD files for build/bazel/examples/apex. 
The previous build/bazel recursive glob is too aggressive. Not all
directories should be ignored by bp2build.

Test: bp2build-incremental builds //bionic/... and everything it depends on in //build/bazel/...
Bug: 193658718
Change-Id: Icb48fd687f0fe6be144caa5b8c9a4f01d15b6c20
 2021-07-26 06:26:36 +00:00
Yi-Yo Chiang
4fcfb53f7b android/androidmk.go: Calls *RequiredModuleNames() to get required modules 
Instead of writing commonProperties.*Required as
LOCAL_*REQUIRED_MODULES, call android.Module.*RequiredModuleNames() to
retrieve list of required, so that the required modules can be modified
by overriding the interface method.

Bug: 191369319
Test: Presubmit
Change-Id: I61fcb82496dcc06831fb42f5af1b53f01999a8d1
 2021-07-24 22:44:36 +08:00
Colin Cross
e9a7d0f732 Merge "Reland "Split the x86 host toolchain into glibc and musl variants"" am: dcbc76134d am: 632d3cf202 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1777148

Change-Id: Icca632d52e633a77b26e960bf11cb448d05bbf64
 2021-07-24 03:09:27 +00:00
Colin Cross
e4e1d6a9bc Merge "Revert "Split the x86 host toolchain into glibc and musl variants"" am: c5647ca16e am: a199295f7a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1777147

Change-Id: Ie502ec0d1e461c7809175d8a27078e92bb9b7e00
 2021-07-23 23:00:47 +00:00
Colin Cross
a45cf21495 Merge changes Idbeb4819,Ifc02f9e5 am: 7628e933b6 am: 038ac4c9bc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1775369

Change-Id: Icb2f36d978b0aee2e883a510029a410d406d1ff3
 2021-07-23 23:00:37 +00:00
Colin Cross
528d67e523 Reland "Split the x86 host toolchain into glibc and musl variants" 
Split the x86 host toolchain into glibc and musl variants

Create new musl toolchains that are based on the existing glibc
toolchains, and add the necessary flags for musl compiles.

This relands Ifc02f9e5afa61ff758be98b0c962f3a4b53d0546 with changes
for I46672e3a096b6ea94ff4c10e1c31e8fd010a163c.

Bug: 190084016
Change-Id: Iaa9f7a50ff601155ecd73acc5701a2c226be66dc
Test: TestArchMutator
 2021-07-23 22:25:36 +00:00
Colin Cross
c5647ca16e Merge "Revert "Split the x86 host toolchain into glibc and musl variants"" 2021-07-23 22:22:11 +00:00
Colin Cross
5d6904e1cf Revert "Split the x86 host toolchain into glibc and musl variants" 
This reverts commit 4fb4ef2242.

Reason for revert: crossed with aosp/1775072

Change-Id: Ied922850b810d82627ba4f9ee42f672cfe286c91
 2021-07-23 22:20:29 +00:00
Colin Cross
7628e933b6 Merge changes Idbeb4819,Ifc02f9e5 
* changes:
  Add dynamic_list property
  Split the x86 host toolchain into glibc and musl variants
 2021-07-23 22:08:19 +00:00
Chris Parsons
474690cecd Skip unnecessary repeititon in validation am: a66c0b5900 am: 962c7e0f49 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1776525

Change-Id: Id7283a576664ac31e0fbcbe805608d1bc0fba23a
 2021-07-23 21:25:50 +00:00
Dan Willemsen
4591b6496d Upgrade to golang protobuf api v2 
Major operations:
 * Fix the go_package entries to be consistent, as the new tool
   complains when it doesn't have a '/'.
 * Regenerate with the new protoc-gen-go tool.
 * github.com/golang/protobuf -> google.golang.org/protobuf
 * proto.[Un]MarshalText -> prototext.[Un]Marshal

Change-Id: Ie1147bd2457fafb66ba555461b3bf14f0561a25d
 2021-07-23 11:12:05 -07:00
Chris Parsons
a66c0b5900 Skip unnecessary repeititon in validation 
Test: Unit tests
Change-Id: I492d3157b1dee358871924071b26a73e8b83a9a5
 2021-07-23 17:23:29 +00:00
Colin Cross
4fb4ef2242 Split the x86 host toolchain into glibc and musl variants 
Create new musl toolchains that are based on the existing glibc
toolchains, and add the necessary flags for musl compiles.

Bug: 190084016
Test: TestArchMutator
Change-Id: Ifc02f9e5afa61ff758be98b0c962f3a4b53d0546
 2021-07-23 08:57:17 -07:00
Christopher Parsons
b46b416998 Merge "Remove bp2build deps mutator" am: 2f1102fe58 am: ba5164965a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1774225

Change-Id: Ief47750896b9ffca5ac375e841288e1b7da8cca0
 2021-07-23 15:22:52 +00:00
Colin Cross
1dd4b94aa3 Merge "Remove Fuchsia support from Soong" am: b8d69871a8 am: be588a31d1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1774379

Change-Id: I9e0151ef36eb011f8c942469ca50eff0b781faf6
 2021-07-23 15:22:42 +00:00
Christopher Parsons
2f1102fe58 Merge "Remove bp2build deps mutator" 2021-07-23 14:55:40 +00:00
Colin Cross
b8d69871a8 Merge "Remove Fuchsia support from Soong" 2021-07-23 14:54:49 +00:00
Treehugger Robot
03ea76a685 Merge "Reland "Add TestArchProperties"" am: 65eb794a5a am: e72d6203b2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1775372

Change-Id: I1c676532f0a88fa8499384090c9ac0835fec4629
 2021-07-23 13:10:34 +00:00