From 16c6c10f7e6bd14c255258f2e03728fa9edbca8e Mon Sep 17 00:00:00 2001 From: Dmitriy Ivanov Date: Tue, 8 Jul 2014 15:18:40 -0700 Subject: Update dlext.h header for 64bits Change-Id: Ia7dcc31158df104012c849a9e6c9a9c5527a922d --- 9/platforms/android-19/arch-arm64/usr/include/android/dlext.h | 11 +++++++++-- .../android-19/arch-mips64/usr/include/android/dlext.h | 11 +++++++++-- .../android-19/arch-x86_64/usr/include/android/dlext.h | 11 +++++++++-- 3 files changed, 27 insertions(+), 6 deletions(-) (limited to '9') diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/dlext.h b/9/platforms/android-19/arch-arm64/usr/include/android/dlext.h index 90962fa..5c3a206 100644 --- a/9/platforms/android-19/arch-arm64/usr/include/android/dlext.h +++ b/9/platforms/android-19/arch-arm64/usr/include/android/dlext.h @@ -49,18 +49,25 @@ enum { */ ANDROID_DLEXT_USE_RELRO = 0x8, + /* Instruct dlopen to use library_fd instead of opening file by name. + * The filename parameter is still used to identify the library. + */ + ANDROID_DLEXT_USE_LIBRARY_FD = 0x10, + /* Mask of valid bits */ ANDROID_DLEXT_VALID_FLAG_BITS = ANDROID_DLEXT_RESERVED_ADDRESS | ANDROID_DLEXT_RESERVED_ADDRESS_HINT | ANDROID_DLEXT_WRITE_RELRO | - ANDROID_DLEXT_USE_RELRO, + ANDROID_DLEXT_USE_RELRO | + ANDROID_DLEXT_USE_LIBRARY_FD, }; typedef struct { - int flags; + uint64_t flags; void* reserved_addr; size_t reserved_size; int relro_fd; + int library_fd; } android_dlextinfo; extern void* android_dlopen_ext(const char* filename, int flag, const android_dlextinfo* extinfo); diff --git a/9/platforms/android-19/arch-mips64/usr/include/android/dlext.h b/9/platforms/android-19/arch-mips64/usr/include/android/dlext.h index 90962fa..5c3a206 100644 --- a/9/platforms/android-19/arch-mips64/usr/include/android/dlext.h +++ b/9/platforms/android-19/arch-mips64/usr/include/android/dlext.h @@ -49,18 +49,25 @@ enum { */ ANDROID_DLEXT_USE_RELRO = 0x8, + /* Instruct dlopen to use library_fd instead of opening file by name. + * The filename parameter is still used to identify the library. + */ + ANDROID_DLEXT_USE_LIBRARY_FD = 0x10, + /* Mask of valid bits */ ANDROID_DLEXT_VALID_FLAG_BITS = ANDROID_DLEXT_RESERVED_ADDRESS | ANDROID_DLEXT_RESERVED_ADDRESS_HINT | ANDROID_DLEXT_WRITE_RELRO | - ANDROID_DLEXT_USE_RELRO, + ANDROID_DLEXT_USE_RELRO | + ANDROID_DLEXT_USE_LIBRARY_FD, }; typedef struct { - int flags; + uint64_t flags; void* reserved_addr; size_t reserved_size; int relro_fd; + int library_fd; } android_dlextinfo; extern void* android_dlopen_ext(const char* filename, int flag, const android_dlextinfo* extinfo); diff --git a/9/platforms/android-19/arch-x86_64/usr/include/android/dlext.h b/9/platforms/android-19/arch-x86_64/usr/include/android/dlext.h index 90962fa..5c3a206 100644 --- a/9/platforms/android-19/arch-x86_64/usr/include/android/dlext.h +++ b/9/platforms/android-19/arch-x86_64/usr/include/android/dlext.h @@ -49,18 +49,25 @@ enum { */ ANDROID_DLEXT_USE_RELRO = 0x8, + /* Instruct dlopen to use library_fd instead of opening file by name. + * The filename parameter is still used to identify the library. + */ + ANDROID_DLEXT_USE_LIBRARY_FD = 0x10, + /* Mask of valid bits */ ANDROID_DLEXT_VALID_FLAG_BITS = ANDROID_DLEXT_RESERVED_ADDRESS | ANDROID_DLEXT_RESERVED_ADDRESS_HINT | ANDROID_DLEXT_WRITE_RELRO | - ANDROID_DLEXT_USE_RELRO, + ANDROID_DLEXT_USE_RELRO | + ANDROID_DLEXT_USE_LIBRARY_FD, }; typedef struct { - int flags; + uint64_t flags; void* reserved_addr; size_t reserved_size; int relro_fd; + int library_fd; } android_dlextinfo; extern void* android_dlopen_ext(const char* filename, int flag, const android_dlextinfo* extinfo); -- cgit v1.1