diff options
| author | Insaf Latypov <saferif@google.com> | 2020-08-06 14:21:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-06 14:21:02 +0000 |
| commit | 4b7de452da5b9274d0ea08e8eafa290ec3f4281c (patch) | |
| tree | 44e37d2ae8652431a2a538ef56cca6db32ac4f7c | |
| parent | fdef268a54a4d23eb252064fbb9494490a0f3e23 (diff) | |
| parent | 34ebc987d79412aef782223ce2ce467d0715a3d5 (diff) | |
| download | libffi-4b7de452da5b9274d0ea08e8eafa290ec3f4281c.tar.gz | |
Merge "Revert "Fix libffi issues with dynamic linking"" am: 411cc2867e am: 46a176655a am: 90b5999718 am: 34ebc987d7
Original change: https://android-review.googlesource.com/c/platform/external/libffi/+/1393196
Change-Id: I17a4c860a2b77fded1a338366856da0855d80ff7
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | linux-arm/fficonfig.h | 2 | ||||
| -rw-r--r-- | linux-arm64/fficonfig.h | 2 | ||||
| -rw-r--r-- | linux-x86/fficonfig.h | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -20,7 +20,7 @@ genrule { tool_files: ["gen_ffi_header.sh"], } -cc_library { +cc_library_static { name: "libffi", host_supported: true, vendor_available: true, diff --git a/linux-arm/fficonfig.h b/linux-arm/fficonfig.h index e6461fe4..1055e03f 100644 --- a/linux-arm/fficonfig.h +++ b/linux-arm/fficonfig.h @@ -41,7 +41,7 @@ #define HAVE_DLFCN_H 1 /* Define if __attribute__((visibility("hidden"))) is supported. */ -#define HAVE_HIDDEN_VISIBILITY_ATTRIBUTE 1 +#undef HAVE_HIDDEN_VISIBILITY_ATTRIBUTE /* Define to 1 if you have the <inttypes.h> header file. */ #define HAVE_INTTYPES_H 1 diff --git a/linux-arm64/fficonfig.h b/linux-arm64/fficonfig.h index e6461fe4..1055e03f 100644 --- a/linux-arm64/fficonfig.h +++ b/linux-arm64/fficonfig.h @@ -41,7 +41,7 @@ #define HAVE_DLFCN_H 1 /* Define if __attribute__((visibility("hidden"))) is supported. */ -#define HAVE_HIDDEN_VISIBILITY_ATTRIBUTE 1 +#undef HAVE_HIDDEN_VISIBILITY_ATTRIBUTE /* Define to 1 if you have the <inttypes.h> header file. */ #define HAVE_INTTYPES_H 1 diff --git a/linux-x86/fficonfig.h b/linux-x86/fficonfig.h index b4cd9055..939ef310 100644 --- a/linux-x86/fficonfig.h +++ b/linux-x86/fficonfig.h @@ -41,7 +41,7 @@ #define HAVE_DLFCN_H 1 /* Define if __attribute__((visibility("hidden"))) is supported. */ -#define HAVE_HIDDEN_VISIBILITY_ATTRIBUTE 1 +#undef HAVE_HIDDEN_VISIBILITY_ATTRIBUTE /* Define to 1 if you have the <inttypes.h> header file. */ #define HAVE_INTTYPES_H 1 |