Skip to content

[pull] master from facebook:master #591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Sep 17, 2020
Merged

[pull] master from facebook:master #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04c874b
Fabric: Using `thread_local` keyword instead on own implementation in…
shergin Sep 17, 2020
18ffe12
Add an explicit NDK version to Android template (#29403)
safaiyeh Sep 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ReactCommon/react/renderer/mounting/TransactionTelemetry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@
namespace facebook {
namespace react {

using ThreadLocalTransactionTelemetry = ThreadStorage<TransactionTelemetry *>;
thread_local TransactionTelemetry *threadLocalTransactionTelemetry = nullptr;

TransactionTelemetry *TransactionTelemetry::threadLocalTelemetry() {
return ThreadLocalTransactionTelemetry::getInstance().get().value_or(nullptr);
return threadLocalTransactionTelemetry;
}

void TransactionTelemetry::setAsThreadLocal() {
ThreadLocalTransactionTelemetry::getInstance().set(this);
threadLocalTransactionTelemetry = this;
}

void TransactionTelemetry::unsetAsThreadLocal() {
ThreadLocalTransactionTelemetry::getInstance().set(nullptr);
threadLocalTransactionTelemetry = nullptr;
}

void TransactionTelemetry::willCommit() {
Expand Down
1 change: 0 additions & 1 deletion ReactCommon/react/renderer/mounting/TransactionTelemetry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#include <cstdint>

#include <react/utils/Telemetry.h>
#include <react/utils/ThreadStorage.h>

namespace facebook {
namespace react {
Expand Down
2 changes: 2 additions & 0 deletions template/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ def jscFlavor = 'org.webkit:android-jsc:+'
def enableHermes = project.ext.react.get("enableHermes", false);

android {
ndkVersion rootProject.ext.ndkVersion

compileSdkVersion rootProject.ext.compileSdkVersion

compileOptions {
Expand Down
1 change: 1 addition & 0 deletions template/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ buildscript {
minSdkVersion = 19
compileSdkVersion = 29
targetSdkVersion = 29
ndkVersion = "20.1.5948944"
}
repositories {
google()
Expand Down