diff --git a/ReactAndroid/src/main/jni/react/BUCK b/ReactAndroid/src/main/jni/react/BUCK index 9cef15a3c..58f3f2085 100644 --- a/ReactAndroid/src/main/jni/react/BUCK +++ b/ReactAndroid/src/main/jni/react/BUCK @@ -14,8 +14,7 @@ PREPROCESSOR_FLAGS = [ '-DLOG_TAG="ReactNative"', '-DWITH_JSC_EXTRA_TRACING=1', '-DWITH_FBSYSTRACE=1', - '-DWITH_JSC_MEMORY_PRESSURE=1', - # '-DWITH_JSC_INTERNAL=1', # Taken care of in D3163295 + '-DWITH_REACT_INTERNAL_SETTINGS=1', ] def react_library(**kwargs): diff --git a/ReactAndroid/src/main/jni/react/JSCExecutor.cpp b/ReactAndroid/src/main/jni/react/JSCExecutor.cpp index 7313e06c7..a21f4b8d9 100644 --- a/ReactAndroid/src/main/jni/react/JSCExecutor.cpp +++ b/ReactAndroid/src/main/jni/react/JSCExecutor.cpp @@ -156,7 +156,7 @@ void JSCExecutor::destroy() { } void JSCExecutor::initOnJSVMThread() { - #if defined(WITH_FB_JSC_TUNING) && !defined(WITH_JSC_INTERNAL) + #if defined(WITH_FB_JSC_TUNING) configureJSCForAndroid(m_jscConfig); #endif m_context = JSGlobalContextCreateInGroup(nullptr, nullptr); @@ -170,10 +170,6 @@ void JSCExecutor::initOnJSVMThread() { installGlobalFunction(m_context, "nativeLoggingHook", JSLogging::nativeHook); - #if defined(WITH_JSC_INTERNAL) && defined(WITH_FB_JSC_TUNING) - configureJSCForAndroid(); - #endif - #ifdef WITH_JSC_EXTRA_TRACING addNativeTracingHooks(m_context); addNativeProfilingHooks(m_context); @@ -188,7 +184,7 @@ void JSCExecutor::initOnJSVMThread() { addJSCPerfStatsHooks(m_context); #endif - #if defined(WITH_FB_JSC_TUNING) && !defined(WITH_JSC_INTERNAL) + #if defined(WITH_FB_JSC_TUNING) configureJSContextForAndroid(m_context, m_jscConfig, m_deviceCacheDir); #endif } @@ -345,7 +341,7 @@ bool JSCExecutor::supportsProfiling() { void JSCExecutor::startProfiler(const std::string &titleString) { #ifdef WITH_JSC_EXTRA_TRACING JSStringRef title = JSStringCreateWithUTF8CString(titleString.c_str()); - #if WITH_JSC_INTERNAL + #if WITH_REACT_INTERNAL_SETTINGS JSStartProfiling(m_context, title, false); #else JSStartProfiling(m_context, title); diff --git a/ReactAndroid/src/main/jni/react/JSCLegacyProfiler.cpp b/ReactAndroid/src/main/jni/react/JSCLegacyProfiler.cpp index e1e2d8b4b..a147b57a9 100644 --- a/ReactAndroid/src/main/jni/react/JSCLegacyProfiler.cpp +++ b/ReactAndroid/src/main/jni/react/JSCLegacyProfiler.cpp @@ -26,7 +26,7 @@ static JSValueRef nativeProfilerStart( } JSStringRef title = JSValueToStringCopy(ctx, arguments[0], exception); - #if WITH_JSC_INTERNAL + #if WITH_REACT_INTERNAL_SETTINGS JSStartProfiling(ctx, title, false); #else JSStartProfiling(ctx, title); diff --git a/ReactAndroid/src/main/jni/react/JSCTracing.cpp b/ReactAndroid/src/main/jni/react/JSCTracing.cpp index 70d79d478..24354eccb 100644 --- a/ReactAndroid/src/main/jni/react/JSCTracing.cpp +++ b/ReactAndroid/src/main/jni/react/JSCTracing.cpp @@ -427,7 +427,7 @@ static JSValueRef nativeTraceBeginLegacy( } JSStringRef title = JSStringCreateWithUTF8CString(ENABLED_FBSYSTRACE_PROFILE_NAME); - #if WITH_JSC_INTERNAL + #if WITH_REACT_INTERNAL_SETTINGS JSStartProfiling(ctx, title, true); #else JSStartProfiling(ctx, title);