am 95c0db1e: am ce3b58a6: Merge "Update dlext.h header"

* commit '95c0db1e7f598599c204840e7d417b661ef42974':
  Update dlext.h header
This commit is contained in:
Dmitriy Ivanov
2014-07-08 22:39:09 +00:00
committed by Android Git Automerger

View File

@@ -49,18 +49,25 @@ enum {
*/ */
ANDROID_DLEXT_USE_RELRO = 0x8, 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 */ /* Mask of valid bits */
ANDROID_DLEXT_VALID_FLAG_BITS = ANDROID_DLEXT_RESERVED_ADDRESS | ANDROID_DLEXT_VALID_FLAG_BITS = ANDROID_DLEXT_RESERVED_ADDRESS |
ANDROID_DLEXT_RESERVED_ADDRESS_HINT | ANDROID_DLEXT_RESERVED_ADDRESS_HINT |
ANDROID_DLEXT_WRITE_RELRO | ANDROID_DLEXT_WRITE_RELRO |
ANDROID_DLEXT_USE_RELRO, ANDROID_DLEXT_USE_RELRO |
ANDROID_DLEXT_USE_LIBRARY_FD,
}; };
typedef struct { typedef struct {
int flags; uint64_t flags;
void* reserved_addr; void* reserved_addr;
size_t reserved_size; size_t reserved_size;
int relro_fd; int relro_fd;
int library_fd;
} android_dlextinfo; } android_dlextinfo;
extern void* android_dlopen_ext(const char* filename, int flag, const android_dlextinfo* extinfo); extern void* android_dlopen_ext(const char* filename, int flag, const android_dlextinfo* extinfo);