Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow the WebView native library to have dependencies." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-05 01:23:37 +00:00
committed by Android (Google) Code Review
parent 0139ae1581 d2f37cc575
commit ec2d399a9e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
native/webview/loader/loader.cpp
View File

@@ -93,7 +93,8 @@ jboolean DoCreateRelroFile(JNIEnv* env, const char* lib, const char* relro,
} }
android_dlextinfo extinfo; android_dlextinfo extinfo;
extinfo.flags = ANDROID_DLEXT_RESERVED_ADDRESS | ANDROID_DLEXT_WRITE_RELRO | extinfo.flags = ANDROID_DLEXT_RESERVED_ADDRESS | ANDROID_DLEXT_WRITE_RELRO |
ANDROID_DLEXT_USE_NAMESPACE; ANDROID_DLEXT_USE_NAMESPACE |
ANDROID_DLEXT_RESERVED_ADDRESS_RECURSIVE;
extinfo.reserved_addr = gReservedAddress; extinfo.reserved_addr = gReservedAddress;
extinfo.reserved_size = gReservedSize; extinfo.reserved_size = gReservedSize;
extinfo.relro_fd = tmp_fd; extinfo.relro_fd = tmp_fd;
@@ -131,7 +132,8 @@ jint DoLoadWithRelroFile(JNIEnv* env, const char* lib, const char* relro,
} }
android_dlextinfo extinfo; android_dlextinfo extinfo;
extinfo.flags = ANDROID_DLEXT_RESERVED_ADDRESS | ANDROID_DLEXT_USE_RELRO | extinfo.flags = ANDROID_DLEXT_RESERVED_ADDRESS | ANDROID_DLEXT_USE_RELRO |
ANDROID_DLEXT_USE_NAMESPACE; ANDROID_DLEXT_USE_NAMESPACE |
ANDROID_DLEXT_RESERVED_ADDRESS_RECURSIVE;
extinfo.reserved_addr = gReservedAddress; extinfo.reserved_addr = gReservedAddress;
extinfo.reserved_size = gReservedSize; extinfo.reserved_size = gReservedSize;
extinfo.relro_fd = relro_fd; extinfo.relro_fd = relro_fd;