Add target.linux_glibc and target.bionic
target.linux_glibc will apply to host builds with glibc, which is
identical to the current target.linux. In a future change, target.linux
will change to affect all targets using the Linux kernel (android,
linux_bionic, and linux_glibc).
target.bionic will apply to all OS variants using Bionic.
Bug: 31559095
Test: Add target.linux_glibc, target.bionic sections to an Android.bp, build
Test: m host
Change-Id: I677a67c22fba148fec264132311e355283f9d88d
diff --git a/android/paths.go b/android/paths.go
index 9c8e93a..4a49d55 100644
--- a/android/paths.go
+++ b/android/paths.go
@@ -714,7 +714,15 @@
}
outPaths = []string{"target", "product", ctx.AConfig().DeviceName(), partition}
} else {
- outPaths = []string{"host", ctx.Os().String() + "-x86"}
+ switch ctx.Os() {
+ case Linux:
+ outPaths = []string{"host", "linux-x86"}
+ case LinuxBionic:
+ // TODO: should this be a separate top level, or shared with linux-x86?
+ outPaths = []string{"host", "linux_bionic-x86"}
+ default:
+ outPaths = []string{"host", ctx.Os().String() + "-x86"}
+ }
}
if ctx.Debug() {
outPaths = append([]string{"debug"}, outPaths...)