aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Light <allight@google.com>2019-02-28 20:11:08 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-02-28 20:11:08 -0800
commit77d66d57c73ac9dabad0886afd2792a61bfaa5f2 (patch)
tree36d2f9f04ddb1cbdbb5f04e71d34c3d14b3598ee
parent8e7ff5cab12cf1c9205d2c1368ef9b82128a18f2 (diff)
parent6f3263d5f4cdccfd7bcf02d7e7304a28b4ea80e7 (diff)
downloadplatform_external_python_cpython2-77d66d57c73ac9dabad0886afd2792a61bfaa5f2.tar.gz
platform_external_python_cpython2-77d66d57c73ac9dabad0886afd2792a61bfaa5f2.tar.bz2
platform_external_python_cpython2-77d66d57c73ac9dabad0886afd2792a61bfaa5f2.zip
Add linux_bionic support
am: 6f3263d5f4 Change-Id: Ie2b163050ac43e7ab7d0b3860aa38d7a9e4e103b
-rw-r--r--Android.bp18
1 files changed, 12 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index b6dc00e2c1..82d293ebbc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -48,6 +48,11 @@ cc_defaults {
android_x86: {
local_include_dirs: ["android_x86/pyconfig"],
},
+ linux_bionic: {
+ // NB linux_bionic is a 'host' architecture but it uses the bionic libc like 'android'
+ // targets so use the android pyconfig.
+ local_include_dirs: ["android_x86_64/pyconfig"],
+ },
android_x86_64: {
local_include_dirs: ["android_x86_64/pyconfig"],
},
@@ -834,12 +839,7 @@ cc_library_static {
"Modules/_sqlite/util.c",
],
target: {
- linux_glibc_x86_64: {
- static_libs: [
- "libsqlite",
- ],
- },
- darwin_x86_64: {
+ host: {
static_libs: [
"libsqlite",
],
@@ -928,6 +928,12 @@ cc_library_static {
"Modules/_ctypes/libffi/src/x86/darwin64.S",
],
},
+ linux_bionic: {
+ local_include_dirs: ["linux_x86_64/libffi"],
+ srcs: [
+ "Modules/_ctypes/libffi/src/x86/unix64.S",
+ ],
+ },
linux_glibc_x86_64: {
local_include_dirs: ["linux_x86_64/libffi"],
srcs: [