Merge "Minor <android/dlext.h> documentation improvements." into main

This commit is contained in:
Elliott Hughes 2024-05-16 21:21:24 +00:00 committed by Gerrit Code Review
commit 88908db595

View file

@ -14,8 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#ifndef __ANDROID_DLEXT_H__ #pragma once
#define __ANDROID_DLEXT_H__
#include <stdbool.h> #include <stdbool.h>
#include <stddef.h> #include <stddef.h>
@ -101,7 +100,7 @@ enum {
ANDROID_DLEXT_FORCE_LOAD = 0x40, ANDROID_DLEXT_FORCE_LOAD = 0x40,
// Historically we had two other options for ART. // Historically we had two other options for ART.
// They were last available in Android P. // They were last available in API level 28.
// Reuse these bits last! // Reuse these bits last!
// ANDROID_DLEXT_FORCE_FIXED_VADDR = 0x80 // ANDROID_DLEXT_FORCE_FIXED_VADDR = 0x80
// ANDROID_DLEXT_LOAD_AT_FIXED_ADDRESS = 0x100 // ANDROID_DLEXT_LOAD_AT_FIXED_ADDRESS = 0x100
@ -115,7 +114,7 @@ enum {
ANDROID_DLEXT_USE_NAMESPACE = 0x200, ANDROID_DLEXT_USE_NAMESPACE = 0x200,
/** /**
* Instructs dlopen to apply `ANDROID_DLEXT_RESERVED_ADDRESS`, * Instructs dlopen() to apply `ANDROID_DLEXT_RESERVED_ADDRESS`,
* `ANDROID_DLEXT_RESERVED_ADDRESS_HINT`, `ANDROID_DLEXT_WRITE_RELRO` and * `ANDROID_DLEXT_RESERVED_ADDRESS_HINT`, `ANDROID_DLEXT_WRITE_RELRO` and
* `ANDROID_DLEXT_USE_RELRO` to any libraries loaded as dependencies of the * `ANDROID_DLEXT_USE_RELRO` to any libraries loaded as dependencies of the
* main library as well. * main library as well.
@ -151,7 +150,7 @@ enum {
struct android_namespace_t; struct android_namespace_t;
/** Used to pass Android-specific arguments to `android_dlopen_ext`. */ /** Used to pass Android-specific arguments to android_dlopen_ext(). */
typedef struct { typedef struct {
/** A bitmask of `ANDROID_DLEXT_` enum values. */ /** A bitmask of `ANDROID_DLEXT_` enum values. */
uint64_t flags; uint64_t flags;
@ -183,5 +182,3 @@ void* _Nullable android_dlopen_ext(const char* _Nullable __filename, int __flags
__END_DECLS __END_DECLS
/** @} */ /** @} */
#endif