Merge changes from topic "linux_glibc"
* changes:
Change androidmk to use linux_glibc instead of linux
Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]
diff --git a/Android.bp b/Android.bp
index b8a4f82..0e57c12 100644
--- a/Android.bp
+++ b/Android.bp
@@ -339,7 +339,7 @@
linux_bionic: {
enabled: true,
},
- linux: {
+ linux_glibc: {
enabled: false,
},
darwin: {
@@ -360,7 +360,7 @@
linux_bionic: {
enabled: true,
},
- linux: {
+ linux_glibc: {
enabled: false,
},
darwin: {
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go
index 6797312..f5858a7 100644
--- a/androidmk/cmd/androidmk/android.go
+++ b/androidmk/cmd/androidmk/android.go
@@ -357,7 +357,7 @@
}
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 @@
// 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 @@
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 @@
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 664d12c..4681a7d 100644
--- a/androidmk/cmd/androidmk/androidmk_test.go
+++ b/androidmk/cmd/androidmk/androidmk_test.go
@@ -256,7 +256,7 @@
darwin: {
srcs: ["darwin.c"],
},
- linux: {
+ linux_glibc: {
srcs: ["linux.c"],
},
windows: {