Commit ba1ce16b authored by Shaka Huang's avatar Shaka Huang Committed by topjohnwu

Fix error in pure 64-bit environment

In Android S preview, there’s no 32-bit libraries in x86_64 system image for emulator.
Signed-off-by: 's avatarShaka Huang <shakalaca@gmail.com>
parent 68090943
...@@ -223,7 +223,7 @@ open class MainActivity : BaseUIActivity<MainViewModel, ActivityMainMd2Binding>( ...@@ -223,7 +223,7 @@ open class MainActivity : BaseUIActivity<MainViewModel, ActivityMainMd2Binding>(
.cancellable(false) .cancellable(false)
.reveal() .reveal()
} }
}g }
private fun askForHomeShortcut() { private fun askForHomeShortcut() {
if (isRunningAsStub && !Config.askedHome && if (isRunningAsStub && !Config.askedHome &&
......
...@@ -110,7 +110,7 @@ void selinux_builtin_impl() { ...@@ -110,7 +110,7 @@ void selinux_builtin_impl() {
} }
void dload_selinux() { void dload_selinux() {
if (access("/system/lib/libselinux.so", F_OK)) if (access("/system/lib/libselinux.so", F_OK) && access("/system/lib64/libselinux.so", F_OK))
return; return;
/* We only check whether libselinux.so exists but don't dlopen. /* We only check whether libselinux.so exists but don't dlopen.
* For some reason calling symbols returned from dlsym * For some reason calling symbols returned from dlsym
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment