From 61cb2686a2e9b95ce3c6bb98807a671d5dd7240b Mon Sep 17 00:00:00 2001
From: Marc Horowitz <mhorowitz@fb.com>
Date: Mon, 11 Nov 2019 18:29:51 -0800
Subject: [PATCH] Update hermes-engine to newest version 0.3.0

Summary:
Changelog:

[Android] [Changed] - Update hermes-engine to newest version 0.3.0

Reviewed By: cpojer

Differential Revision: D18364012

fbshipit-source-id: 819f7f7980f4bc965c8875eef70ee0108882f922
---
 RNTester/android/app/build.gradle                         | 7 +++++++
 .../java/com/facebook/react/uiapp/RNTesterActivity.java   | 2 +-
 .../java/com/facebook/hermes/reactexecutor/OnLoad.cpp     | 2 +-
 ReactCommon/hermes/inspector/Inspector.cpp                | 2 +-
 package.json                                              | 2 +-
 yarn.lock                                                 | 8 ++++----
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/RNTester/android/app/build.gradle b/RNTester/android/app/build.gradle
index edac8893b3c..b8a6437d7b4 100644
--- a/RNTester/android/app/build.gradle
+++ b/RNTester/android/app/build.gradle
@@ -103,6 +103,13 @@ def useIntlJsc = false
 android {
     compileSdkVersion 29
 
+    packagingOptions {
+        pickFirst '**/armeabi-v7a/libc++_shared.so'
+        pickFirst '**/x86/libc++_shared.so'
+        pickFirst '**/x86_64/libc++_shared.so'
+        pickFirst '**/arm64-v8a/libc++_shared.so'
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
diff --git a/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java b/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java
index 1706bfc967c..276a1d899d3 100644
--- a/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java
+++ b/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java
@@ -63,7 +63,7 @@ public class RNTesterActivity extends ReactActivity {
     ReactInstanceManager instanceManager = getReactInstanceManager();
 
     if (instanceManager != null) {
-      instanceManager.onConfigurationChanged(newConfig);
+      instanceManager.onConfigurationChanged(this, newConfig);
     }
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/OnLoad.cpp b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/OnLoad.cpp
index 9dd04e882f0..0db70d1afa0 100644
--- a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/OnLoad.cpp
+++ b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/OnLoad.cpp
@@ -66,7 +66,7 @@ static ::hermes::vm::RuntimeConfig makeRuntimeConfig(
               path += crashId;
               path += ".hermes";
 
-              bool successful = ctx.createSnapshotToFile(path, true);
+              bool successful = ctx.createSnapshotToFile(path);
               if (!successful) {
                 LOG(ERROR) << "Failed to write Hermes Memory Dump to " << path
                            << "\n";
diff --git a/ReactCommon/hermes/inspector/Inspector.cpp b/ReactCommon/hermes/inspector/Inspector.cpp
index 0107fc6da9e..a0352ddb8e0 100644
--- a/ReactCommon/hermes/inspector/Inspector.cpp
+++ b/ReactCommon/hermes/inspector/Inspector.cpp
@@ -190,7 +190,7 @@ void Inspector::triggerAsyncPause(bool andTickle) {
   // In order to ensure that we pause soon, we both set the async pause flag on
   // the runtime, and we run a bit of dummy JS to ensure we enter the Hermes
   // interpreter loop.
-  debugger_.triggerAsyncPause();
+  debugger_.triggerAsyncPause(debugger::AsyncPauseKind::Explicit);
 
   if (andTickle) {
     // We run the dummy JS on a background thread to avoid any reentrancy issues
diff --git a/package.json b/package.json
index 0dd8ab81577..c680cd0ac66 100644
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
     "event-target-shim": "^5.0.1",
     "fbjs": "^1.0.0",
     "fbjs-scripts": "^1.1.0",
-    "hermes-engine": "^0.2.1",
+    "hermes-engine": "~0.3.0",
     "invariant": "^2.2.4",
     "jsc-android": "^245459.0.0",
     "metro-babel-register": "0.57.0",
diff --git a/yarn.lock b/yarn.lock
index fbd3e075da0..72fc3d057fb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3552,10 +3552,10 @@ has@^1.0.1, has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-hermes-engine@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/hermes-engine/-/hermes-engine-0.2.1.tgz#25c0f1ff852512a92cb5c5cc47cf967e1e722ea2"
-  integrity sha512-eNHUQHuadDMJARpaqvlCZoK/Nitpj6oywq3vQ3wCwEsww5morX34mW5PmKWQTO7aU0ck0hgulxR+EVDlXygGxQ==
+hermes-engine@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/hermes-engine/-/hermes-engine-0.3.0.tgz#c03ded211102eef775045a5f55e286783db8ad48"
+  integrity sha512-Xl21n/FohkoeQyz/9AeisoePhXaLvXRyT41xkYHOrqoNr+pkLUGc1xIo486ctIxSp5SN4BkN6T3YFWOdD0ntaQ==
 
 home-or-tmp@^3.0.0:
   version "3.0.0"