diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-09-22 12:28:24 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-09-26 22:41:37 -0700 |
| commit | 866b563d4cc490a4cfa0a3e0611b05539f736dc2 (patch) | |
| tree | dad013a47364d5c340dc21b3293811c63d5daa1d /cc/androidmk.go | |
| parent | 1596e6ee11a2b4b3bed7972a0e5876ac1d608655 (diff) | |
| download | build_soong-866b563d4cc490a4cfa0a3e0611b05539f736dc2.tar.gz build_soong-866b563d4cc490a4cfa0a3e0611b05539f736dc2.tar.bz2 build_soong-866b563d4cc490a4cfa0a3e0611b05539f736dc2.zip | |
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
Diffstat (limited to 'cc/androidmk.go')
| -rw-r--r-- | cc/androidmk.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cc/androidmk.go b/cc/androidmk.go index 2db9d86b..eb630653 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -155,7 +155,11 @@ func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.An } if host { - fmt.Fprintln(w, "LOCAL_MODULE_HOST_OS :=", ctx.Target().Os.String()) + makeOs := ctx.Target().Os.String() + if ctx.Target().Os == android.Linux || ctx.Target().Os == android.LinuxBionic { + makeOs = "linux" + } + fmt.Fprintln(w, "LOCAL_MODULE_HOST_OS :=", makeOs) fmt.Fprintln(w, "LOCAL_IS_HOST_MODULE := true") } else if ctx.vndk() { fmt.Fprintln(w, "LOCAL_USE_VNDK := true") |