aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2017-10-03 03:48:01 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-03 03:48:01 +0000
commit71d780cd014d3aa8a4534551971845f093c8497f (patch)
tree6fee4c7e4d4d9cff3b4f3cf3802448be82c11676
parent30ddbc8c871f9cb60167f2ed36f883f9f32bf05c (diff)
parent4605a631c4ea04bbb5f681b4be153c9bd4306af6 (diff)
downloadcpython2-71d780cd014d3aa8a4534551971845f093c8497f.tar.gz
Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]] am: e41d4ced09 am: d4cef8a3dd am: 0efaf1eac0
am: 4605a631c4 Change-Id: I680da22066ae4c2d4a2bb54050bf47960fc8e051
-rw-r--r--Android.bp6
-rw-r--r--Lib/Android.bp2
2 files changed, 4 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp
index 0513000da2..acb1f966ae 100644
--- a/Android.bp
+++ b/Android.bp
@@ -38,7 +38,7 @@ cc_defaults {
darwin_x86_64: {
local_include_dirs: ["darwin_x86_64/pyconfig"],
},
- linux_x86_64: {
+ linux_glibc_x86_64: {
local_include_dirs: ["linux_x86_64/pyconfig"],
},
windows: {
@@ -265,7 +265,7 @@ cc_binary {
"libsqlite",
],
target: {
- linux_x86_64: {
+ linux_glibc_x86_64: {
host_ldlibs: ["-lutil"],
},
},
@@ -769,7 +769,7 @@ cc_library_static {
"Modules/_ctypes/libffi/src/x86/darwin64.S",
],
},
- linux_x86_64: {
+ linux_glibc_x86_64: {
local_include_dirs: ["linux_x86_64/libffi"],
srcs: [
"Modules/_ctypes/libffi/src/x86/unix64.S",
diff --git a/Lib/Android.bp b/Lib/Android.bp
index 1d89a1b022..3a90571fc3 100644
--- a/Lib/Android.bp
+++ b/Lib/Android.bp
@@ -48,7 +48,7 @@ python_library_host {
darwin: {
srcs: [":py2-plat-darwin"],
},
- linux_x86_64: {
+ linux_glibc_x86_64: {
srcs: [":py2-plat-linux2"],
},
},