From fb2ec1ea47c53c2e7b873acb1cb46192ac74274e Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Tue, 26 Jun 2018 04:57:04 -0700 Subject: [PATCH] Upgrade fbjni Summary: Sync fbjni with `libaries/fbjni`. This includes a hack to fix a deadlock we found for cmake-debug variants only. This still gets us back in sync with other fbjni consumers which is going to save us trouble in the future if Yoga ever wants to make use of a newer feature. Manual changes made in addition to the hand-crafted CMakeLists and cxx buck rules: - `jni::isObjectRefType` has SDK lookup disabled. - `fbjni/` path is changed back to `fb/` to retain compatibility with Yoga. Reviewed By: priteshrnandgaonkar Differential Revision: D8531991 fbshipit-source-id: 776f519e2e5f9bea37f55990348f7ed81c4860b4 --- .../src/main/jni/first-party/yogajni/jni/YGJNI.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp index 69cbb38115c..2bc0ee8bd21 100644 --- a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp +++ b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp @@ -1,10 +1,10 @@ -/** - * Copyright (c) 2014-present, Facebook, Inc. +/* + * Copyright (c) 2014-present, Facebook, Inc. + * + * This source code is licensed under the MIT license found in the LICENSE + * file in the root directory of this source tree. * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. */ - #include #include #include