Commit graph

50769 commits

Author SHA1 Message Date
Andrei-Valentin Onea
b47e89f2d1 Merge "Revert "Prevent unspecified values in soong_config_string_variable"" 2022-03-24 14:11:18 +00:00
Andrei-Valentin Onea
38944c70c4 Revert "Prevent unspecified values in soong_config_string_variable"
This reverts commit 542905a280.

Reason for revert: This check is breaking multiple builds, creating fixes to minimize re-land work.

Change-Id: I6431bd0864f49781910dad787e1ba9375b9931b3
2022-03-24 13:52:58 +00:00
Treehugger Robot
055c213828 Merge "Prevent unspecified values in soong_config_string_variable" am: 1da556928a am: 7ab5956663
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030432

Change-Id: I3d5201c85140f4ce21fa5b79c8535630205b47bf
2022-03-24 04:35:15 +00:00
Treehugger Robot
7ab5956663 Merge "Prevent unspecified values in soong_config_string_variable" am: 1da556928a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030432

Change-Id: I06c567c8c442d27111e55f5b6ed1587bce245865
2022-03-24 04:10:08 +00:00
Treehugger Robot
1da556928a Merge "Prevent unspecified values in soong_config_string_variable" 2022-03-24 00:44:47 +00:00
Mitch Phillips
597605603a [HWASan] Enable zero-initialization.
Previously, we use to fill memory with 0xbe bytes. This caused a lot of
problems that necessitated disablement. For example, 0xbe-filled mutexes
are apparently locked, and there were a few instances of
uninitialized-mutex use.

Given that zero-fill is now the default behaviour, enable zero-init in
HWASan as well.

For now, only fill the first page. It would be preferable to fill the
whole allocation, but I don't want to spin for too many cycles filling
huge secondary pages. In future, we might change the behaviour to have
an explicit "zero initialize" option that completely fills the primarily
allocations, and knows it's unnecessary for the secondary.

Bug: 226078464
Test: Boot w/ HWASan (done by presubmit robot)

Change-Id: I7de3a7f9fa2fdeb5116e5bf6586babe4d06fcb91
2022-03-22 18:38:34 +00:00
Colin Cross
9c495b2617 Merge "Collect deps from r8" am: 057beb2146 am: c20adfad25
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2034623

Change-Id: I46aa9831a8ff4cd4f7a7f0eca886c824a47e7fbe
2022-03-22 17:21:19 +00:00
Sam Delmerico
41ce082b83 Merge "add module type allowlist to bp2build" am: f241e72b57 am: cc64a39195
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2013524

Change-Id: I2e7170cf1422c98707881f1a1da81b66591c8f59
2022-03-22 17:20:39 +00:00
Colin Cross
c20adfad25 Merge "Collect deps from r8" am: 057beb2146
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2034623

Change-Id: I96ca5f440ce5ec4ef3d698121541546feceb823b
2022-03-22 17:04:17 +00:00
Sam Delmerico
cc64a39195 Merge "add module type allowlist to bp2build" am: f241e72b57
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2013524

Change-Id: I6d06858dd336976a175fcb3206e98826099fd05f
2022-03-22 17:03:58 +00:00
Colin Cross
057beb2146 Merge "Collect deps from r8" 2022-03-22 16:40:30 +00:00
Colin Cross
22e6a6f69a Collect deps from r8
Use the new --deps-file argument to collect a deps file from r8, which
will correctly track files included by proguard flags files.

Fixes: 221956283
Test: manual
Change-Id: I92341948311c2c994cc0ae032dc19e09b2e80550
2022-03-22 16:40:13 +00:00
Sam Delmerico
f241e72b57 Merge "add module type allowlist to bp2build" 2022-03-22 16:35:49 +00:00
Treehugger Robot
998cacfb7a Merge "Handle arch/cpu variants in mixed builds" am: 9b0af33cc8 am: 2c66f0f3df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2033126

Change-Id: I9a28d3d89c9e43b7c61200b1d08c72d8e5ae1d22
2022-03-22 16:28:15 +00:00
Treehugger Robot
2c66f0f3df Merge "Handle arch/cpu variants in mixed builds" am: 9b0af33cc8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2033126

Change-Id: I8414b4143d9d75b0ce7280f023cb14997a9954ca
2022-03-22 16:12:12 +00:00
Treehugger Robot
9b0af33cc8 Merge "Handle arch/cpu variants in mixed builds" 2022-03-22 15:52:51 +00:00
Treehugger Robot
4b85795a3b Merge "Prevent kotlinc from reading /tmp/build.txt" am: c4ad11ec28 am: ee5858c4c9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030984

Change-Id: I3f47245352933522a97997bc9b827958403d89b0
2022-03-22 08:09:20 +00:00
Treehugger Robot
ee5858c4c9 Merge "Prevent kotlinc from reading /tmp/build.txt" am: c4ad11ec28
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030984

Change-Id: Id5c9dee6550fc7bac02f475a776330ab209b878e
2022-03-22 07:44:46 +00:00
Treehugger Robot
c4ad11ec28 Merge "Prevent kotlinc from reading /tmp/build.txt" 2022-03-22 07:28:05 +00:00
Treehugger Robot
8b1148783d Merge "Replace $(call my-dir) with a string literal" am: 5beafc1900 am: 0033147396
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2032783

Change-Id: I1c68477e6337bc2a4a77f3dc65ad8a6bdf77eafa
2022-03-22 03:52:52 +00:00
Treehugger Robot
aab0b0eadc Merge "Parse variable references with #s" am: c9e38327dd am: ea0ff15f1e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2028744

Change-Id: I92b670b1ad681acfc808a340747329ec966631de
2022-03-22 03:52:44 +00:00
Treehugger Robot
0033147396 Merge "Replace $(call my-dir) with a string literal" am: 5beafc1900
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2032783

Change-Id: I615a72e07399b4ec2eb79c6217bc7d652716686f
2022-03-22 03:30:01 +00:00
Treehugger Robot
ea0ff15f1e Merge "Parse variable references with #s" am: c9e38327dd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2028744

Change-Id: Ia0997c02afcd86b78fb77d189905d7835f65390f
2022-03-22 03:29:50 +00:00
Treehugger Robot
5beafc1900 Merge "Replace $(call my-dir) with a string literal" 2022-03-22 03:24:47 +00:00
Treehugger Robot
c9e38327dd Merge "Parse variable references with #s" 2022-03-22 03:15:47 +00:00
Treehugger Robot
3da7775103 Merge "Revert "225341614: Enforce ExtraText in platform builds"" am: bc1217b4e7 am: 52b82e0eb1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2034523

Change-Id: I31c4c748ebad128a4a63ad8288bf69afe6c4db51
2022-03-21 22:13:40 +00:00
Treehugger Robot
52b82e0eb1 Merge "Revert "225341614: Enforce ExtraText in platform builds"" am: bc1217b4e7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2034523

Change-Id: Ib3e8046937225243b06f300bd01152b2ac515dc3
2022-03-21 21:54:50 +00:00
Treehugger Robot
bc1217b4e7 Merge "Revert "225341614: Enforce ExtraText in platform builds"" 2022-03-21 21:40:12 +00:00
Treehugger Robot
9db29d32db Merge "Don't pass static libs to r8" am: 2f39f7dacd am: da8a4b71bf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030983

Change-Id: I162633fbd9b1e1d819a196b003fae79b6a98cda7
2022-03-21 20:02:39 +00:00
Treehugger Robot
da8a4b71bf Merge "Don't pass static libs to r8" am: 2f39f7dacd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030983

Change-Id: I5a1923ceea487f3ad0ab1725588ae2a7de3b90f4
2022-03-21 19:42:00 +00:00
Treehugger Robot
2f39f7dacd Merge "Don't pass static libs to r8" 2022-03-21 19:21:02 +00:00
Tor Norbye
73dca5c905 Revert "225341614: Enforce ExtraText in platform builds"
This reverts commit 4c471458ec.

Reason for revert: There were failures in some build targets that
must not have run during presubmit checks (for example,
aosp-master/errorprone@8332220)

Change-Id: I220fd70df663ba49d876fb3ebf841fa9f3f06b97
2022-03-21 18:56:14 +00:00
Tor Norbye
379af1cd38 Merge "225341614: Enforce ExtraText in platform builds" am: 6014299148 am: 1f2b3a1ae8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2033404

Change-Id: Ibf478876fefd7bdc94a0786f34c3a388c1f13c93
2022-03-21 18:54:14 +00:00
Tor Norbye
1f2b3a1ae8 Merge "225341614: Enforce ExtraText in platform builds" am: 6014299148
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2033404

Change-Id: Ica70d764dbbe16d08697744befe479534d8d859f
2022-03-21 18:19:05 +00:00
Tor Norbye
6014299148 Merge "225341614: Enforce ExtraText in platform builds" 2022-03-21 17:58:32 +00:00
Liz Kammer
0940b89937 Handle arch/cpu variants in mixed builds
Test: mixed_libc.sh
Change-Id: Ib5084060199b8e1a5955bd51bc3fd793bb83a1eb
2022-03-21 11:13:49 -04:00
Tor Norbye
4c471458ec 225341614: Enforce ExtraText in platform builds
Bug: 225341614
Test: N/A
Change-Id: Ic2ed5006643f3646315f16fe77552398f38c0265
2022-03-21 08:12:25 -07:00
Liz Kammer
cc2c1efc9a Dedupe libraries in both static and whole static
In Soong, libraries can appear in both static and whole static libs;
however, in Bazel, this results in errors due to duplicate libraries.

Test: bp2build.sh
Change-Id: I9dda4f7a7812340d28a6160d0e25f421c9db6612
2022-03-21 09:03:29 -04:00
Treehugger Robot
fc629ece4f Merge "Do not dump metrics if reproxy was never started" am: 13642d4735 am: a0d2817f36
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2031425

Change-Id: I1e8eeebb13120c0d71620f35ad44b57e91c7ccf5
2022-03-21 07:43:30 +00:00
Treehugger Robot
8d755e501b Merge "Add google_prod_creds to the list of auth mechanisms" am: ca8e93e79d am: ae5dee2a03
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2031424

Change-Id: If44cbc0cb472ba732d12a3dddd766be9753562e8
2022-03-21 07:43:21 +00:00
Treehugger Robot
a0d2817f36 Merge "Do not dump metrics if reproxy was never started" am: 13642d4735
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2031425

Change-Id: Ib1fb3f6a43ffb92810a3e977c31f45d9e56c9d00
2022-03-21 07:23:32 +00:00
Treehugger Robot
ae5dee2a03 Merge "Add google_prod_creds to the list of auth mechanisms" am: ca8e93e79d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2031424

Change-Id: I82ec0a4d577645f3e377cc5534c8093e4d7345db
2022-03-21 07:23:22 +00:00
Treehugger Robot
13642d4735 Merge "Do not dump metrics if reproxy was never started" 2022-03-21 07:05:41 +00:00
Treehugger Robot
ca8e93e79d Merge "Add google_prod_creds to the list of auth mechanisms" 2022-03-21 07:01:31 +00:00
Yu Liu
0db78356ba Merge "Support tailoring clang --target flag based on min sdk version." am: ba4638f529 am: 41b4e249ce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2011702

Change-Id: I5bb2e95bd00d6f98e74b5990253aaf437e2db25b
2022-03-19 16:27:52 +00:00
Yu Liu
41b4e249ce Merge "Support tailoring clang --target flag based on min sdk version." am: ba4638f529
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2011702

Change-Id: Ia04304bd3d4df9af2590f3a43f67632041eb7e07
2022-03-19 16:11:34 +00:00
Yu Liu
ba4638f529 Merge "Support tailoring clang --target flag based on min sdk version." 2022-03-19 15:52:15 +00:00
Cole Faust
f5adedce03 Replace $(call my-dir) with a string literal
This is so that we can set LOCAL_PATH to the result
of my-dir, as LOCAL_PATH can only be set to a string
literal of the exact value of LOCAL_PATH.

It's probably also the correct choice to start phasing
out LOCAL_PATH.

Bug: 214405650
Test: go test
Change-Id: Ia97d7fedf4ce62643921d90a176e65edd4e2fce6
2022-03-18 14:05:06 -07:00
Colin Cross
c2d504873f Prevent kotlinc from reading /tmp/build.txt
Pass -Didea.plugins.compatible.build=999.SNAPSHOT to kotlinc and kapt
to prevent it from reading /tmp/build.txt and failing with an obscure
exception:
exception: java.lang.ExceptionInInitializerError
	at com.intellij.openapi.util.BuildNumber.currentVersion(BuildNumber.java:297)
...

Bug: 222162908
Test: m metalava with /tmp/build.txt present
Change-Id: I5faced4a2e94561ce3aa37bfaacf5bd7d988a4f0
2022-03-18 20:48:51 +00:00
Colin Cross
9bb9bfb349 Don't pass static libs to r8
r8 gets the static libs in the program jar, it shouldn't also get
them as library jars.  Keep a separate classpath for dexing that
includes libs but not static_libs.

Bug: 222468116
Test: m checkbuild
Test: TestD8
Test: TestR8
Change-Id: Icca3393f496cbcadcc633f3b156761e6c145f975
2022-03-18 20:48:27 +00:00