diff options
| author | Andreas Gampe <agampe@google.com> | 2014-09-04 21:47:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-04 21:47:08 +0000 |
| commit | 0e59bf8b767e9be7ea22c67011ea902d597fe43f (patch) | |
| tree | bf6fbf9900ecf85d331023341af7908642825b23 /runtime/runtime.h | |
| parent | 552da6697f77b1d94a69b0ba54509a25a0de3ae7 (diff) | |
| parent | 6be67eeedbe60afce42300ae3e7f0e7180a96efa (diff) | |
| download | art-0e59bf8b767e9be7ea22c67011ea902d597fe43f.tar.gz art-0e59bf8b767e9be7ea22c67011ea902d597fe43f.tar.bz2 art-0e59bf8b767e9be7ea22c67011ea902d597fe43f.zip | |
Merge "ART: Change ART for new native bridge sequence"
Diffstat (limited to 'runtime/runtime.h')
| -rw-r--r-- | runtime/runtime.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/runtime/runtime.h b/runtime/runtime.h index 632806f303..a0993ca91e 100644 --- a/runtime/runtime.h +++ b/runtime/runtime.h @@ -393,9 +393,13 @@ class Runtime { void SetStatsEnabled(bool new_state); + enum class NativeBridgeAction { // private + kUnload, + kInitialize + }; void PreZygoteFork(); bool InitZygote(); - void DidForkFromZygote(); + void DidForkFromZygote(NativeBridgeAction action); const instrumentation::Instrumentation* GetInstrumentation() const { return &instrumentation_; |