summaryrefslogtreecommitdiffstats
path: root/dalvik
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-09-02 21:20:51 -0700
committerAndreas Gampe <agampe@google.com>2014-09-08 13:08:00 -0700
commit78b68a0590eeec5187bbf74d3f6eeaaf62165a2a (patch)
tree9ca6783c3c3cc671393f19eb668e768985f8997b /dalvik
parent2b26994c5069c22c25d8456ba6fba7d9fd3d95ae (diff)
downloadlibcore-78b68a0590eeec5187bbf74d3f6eeaaf62165a2a.zip
libcore-78b68a0590eeec5187bbf74d3f6eeaaf62165a2a.tar.gz
libcore-78b68a0590eeec5187bbf74d3f6eeaaf62165a2a.tar.bz2
Libcore: Add parameter to zygote hook
Add a parameter to be passed to ART. (cherry picked from commit 255f6218025d5673b1e347b1c31b23202587f8f6) Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
Diffstat (limited to 'dalvik')
-rw-r--r--dalvik/src/main/java/dalvik/system/ZygoteHooks.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java b/dalvik/src/main/java/dalvik/system/ZygoteHooks.java
index 1f8f28a..dc730e6 100644
--- a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java
+++ b/dalvik/src/main/java/dalvik/system/ZygoteHooks.java
@@ -59,10 +59,11 @@ public final class ZygoteHooks {
/**
* Called by the zygote in the child process after every fork. The debug
- * flags from {@code debugFlags} are applied to the child process.
+ * flags from {@code debugFlags} are applied to the child process. The string
+ * {@code instructionSet} determines whether to use a native bridge.
*/
- public void postForkChild(int debugFlags) {
- nativePostForkChild(token, debugFlags);
+ public void postForkChild(int debugFlags, String instructionSet) {
+ nativePostForkChild(token, debugFlags, instructionSet);
}
/**
@@ -75,7 +76,8 @@ public final class ZygoteHooks {
}
private static native long nativePreFork();
- private static native void nativePostForkChild(long token, int debugFlags);
+ private static native void nativePostForkChild(long token, int debugFlags,
+ String instructionSet);
/**
* We must not fork until we're single-threaded again. Wait until /proc shows we're