Commit Graph

38267 Commits

Author SHA1 Message Date
Treehugger Robot
23c45bb446 Merge "Add some more properties to the bp2build APEX converter." am: 57dd3c40e8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778085

Change-Id: I913c52ca4f6b3f6ad35a941459a6adc2282d8962
2021-07-27 02:42:03 +00:00
Treehugger Robot
57dd3c40e8 Merge "Add some more properties to the bp2build APEX converter." 2021-07-27 02:17:51 +00:00
Jiyong Park
20ab109f68 Merge changes from topic "remove_ndk_platform" am: 1b064ab3e7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1777786

Change-Id: I4c17e059df37993947cf4c61d439560dd0303fed
2021-07-27 01:19:35 +00:00
Jiyong Park
fe9eee7747 Reland: Add more target-specific properties am: a592b6f8e0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1777785

Change-Id: Id26c90054a70e88e7ac94fe4b0d110160acabe25
2021-07-27 01:19:34 +00:00
Jiyong Park
1b064ab3e7 Merge changes from topic "remove_ndk_platform"
* changes:
  *-ndk.so libraries are added to VndkMustUseVendorVariantList
  Reland: Add more target-specific properties
2021-07-27 01:01:58 +00:00
Treehugger Robot
8846c8876f Merge changes I19f0e104,I7994bee6 am: 2c405ff6ae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1765127

Change-Id: I18aaf7478db8dd882f7497bf2aed61bf41291297
2021-07-27 00:57:15 +00:00
Treehugger Robot
2c405ff6ae Merge changes I19f0e104,I7994bee6
* changes:
  Emit mkpatsubst call for $(patsubst ...)
  Emit mksubst call for $(subst ...)
2021-07-27 00:41:21 +00:00
Kousik Kumar
a7ab7c9394 Merge "Load RBE related env vars from config files" am: b3a5d18470
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1773209

Change-Id: Id84167a3ae6ab15c8b74b72b4cc2c179e0da5d0c
2021-07-26 22:11:10 +00:00
Kousik Kumar
b3a5d18470 Merge "Load RBE related env vars from config files" 2021-07-26 21:57:49 +00:00
Kousik Kumar
51c4091309 Load RBE related env vars from config files
This is as part of an effort to move environment variables into config
files so that configs can be tied down to source.

Test:
Ran a build with "ANDROID_BUILD_ENVIRONMENT_CONFIG=googler m"  which ran
a non-RBE build (since this is vanilla aosp).
Also ran a build with "ANDROID_BUILD_ENVIRONMENT_CONFIG= m" which ran a
non-RBE build.

https://paste.googleplex.com/5637282880028672

Bug: b/194679562
Change-Id: I416e8da75f84aa2b53995f525cf50501488dc972
2021-07-26 21:55:25 +00:00
satayev
adb9e9f752 Merge "Rename UpdatableBootJars to ApexBootJars." am: 4102c0cc47
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1773912

Change-Id: Ife99a76ee653d4724184b92dddabe5a13a662c43
2021-07-26 18:18:50 +00:00
Sasha Smundak
94b41c76da Emit mkpatsubst call for $(patsubst ...)
Bug: 172923994
Test: internal
Change-Id: I19f0e104d253230e603a098605736ac36e65818e
2021-07-26 11:12:04 -07:00
satayev
4102c0cc47 Merge "Rename UpdatableBootJars to ApexBootJars." 2021-07-26 17:59:36 +00:00
Sasha Smundak
9d011abcd5 Emit mksubst call for $(subst ...)
Bug: 172923994
Test: internal
Change-Id: I7994bee61f6f8bdee6eac50ecb8a6064830447a4
2021-07-26 10:25:43 -07:00
Jingwen Chen
ccce36b584 bp2build BUILD files for build/bazel/examples/apex. am: b643c7a085
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1777787

Change-Id: I50637419cae1b215ba0ae1cb3897d668f848ec5d
2021-07-26 11:56:41 +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
Jiyong Park
44a13ac401 *-ndk.so libraries are added to VndkMustUseVendorVariantList
We will replace the ndk_platform backend with the ndk backend. The
former hasn't been deleted yet because there already are references to
it. When the existing references are all replaced with the ndk backend,
we will remove the ndk_platform backend and the corresponding libraries
will be removed from this list.

Bug: 161456198
Test: m

Merged-In: I7c7aa1025a876e45fc4779378825d91098164e84
Change-Id: I7c7aa1025a876e45fc4779378825d91098164e84
(cherry picked from commit b58719c156)
2021-07-26 13:22:49 +09:00
Jiyong Park
a592b6f8e0 Reland: Add more target-specific properties
Following properties are added:

* vendor.header_libs
* platform.cflags
* platform.header_libs
* platform.exclude_shared_libs

These are used in the *-ndk libraries generated from the aidl_interface
modules, so that we can build the platform variants of the libraries
just like the *-ndk_platform libraries. Eventually, we will remove the
*-ndk_platform libraries.

Bug: 161456198
Test: m
Merged-In: I126e272cd29eb1e03662c54bfa8bd64e704adc74
Change-Id: I126e272cd29eb1e03662c54bfa8bd64e704adc74
(cherry picked from commit bb14481408)
2021-07-26 11:19:35 +09:00
Treehugger Robot
918a5ba519 Merge "Disable lint checks which do not apply in the platform" am: 04f3f07752
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1777154

Change-Id: Icc38c296a22cec338dd1d872bd8cfcc1d047c432
2021-07-24 16:23:51 +00:00
Treehugger Robot
04f3f07752 Merge "Disable lint checks which do not apply in the platform" 2021-07-24 16:10:31 +00:00
Tor Norbye
b015aecbfe Disable lint checks which do not apply in the platform
Lint is primarily targeted at Android app developers, and some of the
checks reflect that. Some of these checks do not apply to the platform
code, where they can produce false positives.

This CL adds a number of these to an exclude list passed in to lint.
Also reenables a check previously disabled because of a bug which has
since been fixed, HardcodedDebugMode, and downgrades from error to
warning a few more lint checks which have existing violations in the
codebase when lint is upgraded to the latest version.

Test: Existing
Bug: None
Change-Id: Icbfbcfd51516c43c342e0d3cdb6973278110fd35
2021-07-24 14:48:19 +00:00
Colin Cross
632d3cf202 Merge "Reland "Split the x86 host toolchain into glibc and musl variants"" am: dcbc76134d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1777148

Change-Id: Ia56a837f9a8be553bb4275e60003dfbcfb2530f6
2021-07-24 02:52:14 +00:00
Colin Cross
dcbc76134d Merge "Reland "Split the x86 host toolchain into glibc and musl variants"" 2021-07-24 02:37:02 +00:00
Treehugger Robot
1ac81df011 Merge "Product config makefiles to Starlark converter" am: bfee43545f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1501163

Change-Id: I00af27ab15b646e2ce156c9b489a0764c22c1552
2021-07-23 23:30:34 +00:00
Treehugger Robot
bfee43545f Merge "Product config makefiles to Starlark converter" 2021-07-23 23:14:41 +00:00
Colin Cross
a199295f7a Merge "Revert "Split the x86 host toolchain into glibc and musl variants"" am: c5647ca16e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1777147

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

Change-Id: Ib7368499e0d9b099695ef6ff3e8484b396410edc
2021-07-23 22:42:21 +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
Treehugger Robot
0cddfa441d Merge "Remove default_shared_libs" am: 2231f8a21c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1775072

Change-Id: I129cc4943e18767d19baacc029ac41709b3f45d2
2021-07-23 21:25:06 +00:00
Treehugger Robot
2231f8a21c Merge "Remove default_shared_libs" 2021-07-23 21:18:51 +00:00
Treehugger Robot
98f9112255 Merge "Add a phony target for all Rust targets" am: 40fa08bfa7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1775370

Change-Id: I1a90eda9535cbbd09ca07360dcd201e30be7ba2e
2021-07-23 20:58:25 +00:00
Treehugger Robot
1f7ae9dd84 Merge "Update the Rust prebuilt version number" am: 02fa0c36e4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1773048

Change-Id: Ic74cd0975ac26549ac866096ba96afa11b3ef71c
2021-07-23 20:57:40 +00:00
Chris Parsons
962c7e0f49 Skip unnecessary repeititon in validation am: a66c0b5900
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1776525

Change-Id: Ia294ee9f8ff4ed06209d9fa3ddceb50d06ace098
2021-07-23 20:57:13 +00:00
Kalesh Singh
63f2974d3f Merge "Update VndkMustUseVendorVariantList" am: 295ae69b04
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1774327

Change-Id: Ie3638f44ba2a63b0d2678d67ce8f2aa2032d2095
2021-07-23 20:56:44 +00:00
Treehugger Robot
40fa08bfa7 Merge "Add a phony target for all Rust targets" 2021-07-23 20:28:02 +00:00
Treehugger Robot
02fa0c36e4 Merge "Update the Rust prebuilt version number" 2021-07-23 20:18:30 +00:00
Chris Wailes
74be764496 Add a phony target for all Rust targets
Test: m rust
Change-Id: Id347edf9998f6714622c9f173420477a9e534723
2021-07-23 10:38:01 -07:00
Chris Parsons
a66c0b5900 Skip unnecessary repeititon in validation
Test: Unit tests
Change-Id: I492d3157b1dee358871924071b26a73e8b83a9a5
2021-07-23 17:23:29 +00:00
Kalesh Singh
295ae69b04 Merge "Update VndkMustUseVendorVariantList" 2021-07-23 17:16:28 +00:00
Colin Cross
5942238966 Add dynamic_list property
Add a dynamic_list property that is similar to version_script but uses
a -Wl,--dynamic-list flag instead of -Wl,--version-script.

Bug: 190084016
Test: TestLibraryDynamicList
Change-Id: Idbeb4819ce4d92e50c4e9b27ec8f150d566d380a
2021-07-23 10:15:13 -07: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
Dan Willemsen
31d35b6305 Merge "go2bp: Add -limit and -skip-tests to more easily limit imported modules" am: 00d21ce8a5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1751728

Change-Id: I3aa2d7b63152073dac4eec3dfd1cc9a54d83d6af
2021-07-23 15:55:16 +00:00
Dan Willemsen
00d21ce8a5 Merge "go2bp: Add -limit and -skip-tests to more easily limit imported modules" 2021-07-23 15:38:35 +00:00
Christopher Parsons
ba5164965a Merge "Remove bp2build deps mutator" am: 2f1102fe58
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1774225

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

Change-Id: Iaf442fc3ae824cf6e27f820a9044b119afbfa509
2021-07-23 15:05:17 +00:00
Joel Galenson
9dd30ca284 Merge "Add libc to Rust allowlist." am: 850edab344
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1774006

Change-Id: I0f882b479691b5c00dc07ed33416368fdf5a3cff
2021-07-23 15:04:54 +00:00