From 565a24140b276c6ffbae6e7c508250109b852184 Mon Sep 17 00:00:00 2001 From: Aaron Chiu Date: Wed, 20 Sep 2017 10:42:00 -0700 Subject: [PATCH] add Native Module init Reviewed By: achen1 Differential Revision: D5740540 fbshipit-source-id: 9989424812fdcfd0a54c2ccf1e973aa7cc2a1f67 --- .../debug/tags/ReactDebugOverlayTags.java | 2 ++ .../facebook/react/bridge/ModuleHolder.java | 26 +++++++++++-------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/debug/tags/ReactDebugOverlayTags.java b/ReactAndroid/src/main/java/com/facebook/debug/tags/ReactDebugOverlayTags.java index 651fb56db47..dc64128b0cb 100644 --- a/ReactAndroid/src/main/java/com/facebook/debug/tags/ReactDebugOverlayTags.java +++ b/ReactAndroid/src/main/java/com/facebook/debug/tags/ReactDebugOverlayTags.java @@ -17,4 +17,6 @@ public class ReactDebugOverlayTags { public static final DebugOverlayTag BRIDGE_CALLS = new DebugOverlayTag( "Bridge Calls", "JS to Java calls (warning: this is spammy)", Color.MAGENTA); + public static final DebugOverlayTag NATIVE_MODULE = + new DebugOverlayTag("Native Module", "Native Module init", Color.rgb(0x80, 0x00, 0x80)); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.java index 2730e94be4a..25259afaf96 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.java @@ -2,22 +2,22 @@ package com.facebook.react.bridge; -import javax.annotation.Nullable; -import javax.annotation.concurrent.GuardedBy; -import javax.inject.Provider; - -import java.util.concurrent.atomic.AtomicInteger; - -import com.facebook.infer.annotation.Assertions; -import com.facebook.proguard.annotations.DoNotStrip; -import com.facebook.react.module.model.ReactModuleInfo; -import com.facebook.systrace.SystraceMessage; - import static com.facebook.infer.annotation.Assertions.assertNotNull; import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_MODULE_END; import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_MODULE_START; import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE; +import com.facebook.debug.holder.PrinterHolder; +import com.facebook.debug.tags.ReactDebugOverlayTags; +import com.facebook.infer.annotation.Assertions; +import com.facebook.proguard.annotations.DoNotStrip; +import com.facebook.react.module.model.ReactModuleInfo; +import com.facebook.systrace.SystraceMessage; +import java.util.concurrent.atomic.AtomicInteger; +import javax.annotation.Nullable; +import javax.annotation.concurrent.GuardedBy; +import javax.inject.Provider; + /** * Holder to enable us to lazy create native modules. * @@ -62,6 +62,8 @@ public class ModuleHolder { mCanOverrideExistingModule = nativeModule.canOverrideExistingModule(); mHasConstants = true; mModule = nativeModule; + PrinterHolder.getPrinter() + .logMessage(ReactDebugOverlayTags.NATIVE_MODULE, "NativeModule init: %s", mName); } /* @@ -155,6 +157,8 @@ public class ModuleHolder { SystraceMessage.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "ModuleHolder.createModule") .arg("name", mName) .flush(); + PrinterHolder.getPrinter() + .logMessage(ReactDebugOverlayTags.NATIVE_MODULE, "NativeModule init: %s", mName); NativeModule module; try { module = assertNotNull(mProvider).get();