diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-10-02 10:52:27 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-10-02 10:55:22 -0700 |
| commit | dece58146fcd16f37345d3589219651f3777ba8f (patch) | |
| tree | 208f3c170e0cba99435202a557727d2940f36917 /androidmk | |
| parent | 9d6c6722a72d0ce56c9b03512553eebbb1f0a11a (diff) | |
| download | build_soong-dece58146fcd16f37345d3589219651f3777ba8f.tar.gz build_soong-dece58146fcd16f37345d3589219651f3777ba8f.tar.bz2 build_soong-dece58146fcd16f37345d3589219651f3777ba8f.zip | |
Change androidmk to use linux_glibc instead of linux
Test: m blueprint_tools
Test: androidmk system/core/fastboot/Android.mk
Change-Id: I7003b86f16a522f01c826092b8e45603270aa391
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/cmd/androidmk/android.go | 20 | ||||
| -rw-r--r-- | androidmk/cmd/androidmk/androidmk_test.go | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index 67973129..f5858a73 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -357,7 +357,7 @@ func hostOs(ctx variableAssignmentContext) error { } if !inList("linux") && err == nil { - err = setVariable(ctx.file, ctx.append, "target.linux", "enabled", falseValue, true) + err = setVariable(ctx.file, ctx.append, "target.linux_glibc", "enabled", falseValue, true) } if !inList("darwin") && err == nil { @@ -609,7 +609,7 @@ var propertyPrefixes = []struct{ mk, bp string }{ // 64 must be after x86_64 {"64", "multilib.lib64"}, {"darwin", "target.darwin"}, - {"linux", "target.linux"}, + {"linux", "target.linux_glibc"}, {"windows", "target.windows"}, } @@ -627,11 +627,11 @@ var conditionalTranslations = map[string]map[bool]string{ true: "target.windows", false: "target.not_windows"}, "($(HOST_OS),linux)": { - true: "target.linux", - false: "target.not_linux"}, + true: "target.linux_glibc", + false: "target.not_linux_glibc"}, "($(HOST_OS), linux)": { - true: "target.linux", - false: "target.not_linux"}, + true: "target.linux_glibc", + false: "target.not_linux_glibc"}, "($(BUILD_OS),darwin)": { true: "target.darwin", false: "target.not_darwin"}, @@ -639,11 +639,11 @@ var conditionalTranslations = map[string]map[bool]string{ true: "target.darwin", false: "target.not_darwin"}, "($(BUILD_OS),linux)": { - true: "target.linux", - false: "target.not_linux"}, + true: "target.linux_glibc", + false: "target.not_linux_glibc"}, "($(BUILD_OS), linux)": { - true: "target.linux", - false: "target.not_linux"}, + true: "target.linux_glibc", + false: "target.not_linux_glibc"}, "(,$(TARGET_BUILD_APPS))": { false: "product_variables.unbundled_build"}, "($(TARGET_BUILD_PDK),true)": { diff --git a/androidmk/cmd/androidmk/androidmk_test.go b/androidmk/cmd/androidmk/androidmk_test.go index 664d12c2..4681a7d2 100644 --- a/androidmk/cmd/androidmk/androidmk_test.go +++ b/androidmk/cmd/androidmk/androidmk_test.go @@ -256,7 +256,7 @@ cc_library_shared { darwin: { srcs: ["darwin.c"], }, - linux: { + linux_glibc: { srcs: ["linux.c"], }, windows: { |