diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-21 23:48:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-21 23:48:34 +0000 |
| commit | 0cdac4ad7cc8a65d916c87d9dea785f6c280adcd (patch) | |
| tree | 33814d4e6b2c85cbd2c0fd30f7674ca19709cf6c /core/java | |
| parent | 38de36f46e1d4b562c1ceb944d4c9597f85912e5 (diff) | |
| parent | 893b3728cbc6222eaff03e3c5744288d1f8b5418 (diff) | |
AppZygote: start with the correct instruction set am: 041f016971 am: cbf8e9dd7a am: 893b3728cb
Change-Id: Ie039ef64d0d307262d0ffe53353747d64c720544
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/AppZygote.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/os/AppZygote.java b/core/java/android/os/AppZygote.java index 6daa5b4dc6d8..92574968e965 100644 --- a/core/java/android/os/AppZygote.java +++ b/core/java/android/os/AppZygote.java @@ -21,6 +21,8 @@ import android.util.Log; import com.android.internal.annotations.GuardedBy; +import dalvik.system.VMRuntime; + /** * AppZygote is responsible for interfacing with an application-specific zygote. * @@ -113,7 +115,7 @@ public class AppZygote { "app_zygote", // seInfo abi, // abi abi, // acceptedAbiList - null, // instructionSet + VMRuntime.getInstructionSet(abi), // instructionSet mZygoteUidGidMin, mZygoteUidGidMax); |