Merge "Reformat build/soong for go 1.19"
diff --git a/README.md b/README.md
index caffd3d..87d6948 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,7 @@
By design, Android.bp files are very simple. There are no conditionals or
control flow statements - any complexity is handled in build logic written in
Go. The syntax and semantics of Android.bp files are intentionally similar
-to [Bazel BUILD files](https://www.bazel.io/versions/master/docs/be/overview.html)
-when possible.
+to [Bazel BUILD files](https://bazel.build/concepts/build-files) when possible.
### Modules
@@ -596,14 +595,14 @@
start the build with `SOONG_DELVE=<listen addr>` in the environment.
For example:
```bash
-SOONG_DELVE=:5006 m nothing
+SOONG_DELVE=5006 m nothing
```
To make `soong_ui` wait for a debugger connection, use the `SOONG_UI_DELVE`
variable:
```
-SOONG_UI_DELVE=:5006 m nothing
+SOONG_UI_DELVE=5006 m nothing
```
diff --git a/cc/lto.go b/cc/lto.go
index 2c274bd..1da69bf 100644
--- a/cc/lto.go
+++ b/cc/lto.go
@@ -136,9 +136,10 @@
}
func (lto *lto) DefaultThinLTO(ctx BaseModuleContext) bool {
+ lib32 := ctx.Arch().ArchType.Multilib == "lib32"
host := ctx.Host()
vndk := ctx.isVndk() // b/169217596
- return GlobalThinLTO(ctx) && !lto.Never() && !host && !vndk
+ return GlobalThinLTO(ctx) && !lto.Never() && !lib32 && !host && !vndk
}
func (lto *lto) FullLTO() bool {