diff --git a/Libraries/Devtools/setupDevtools.js b/Libraries/Devtools/setupDevtools.js index 307c268f71..e81a862990 100644 --- a/Libraries/Devtools/setupDevtools.js +++ b/Libraries/Devtools/setupDevtools.js @@ -11,10 +11,17 @@ */ 'use strict'; +var Platform = require('Platform'); +var NativeModules = require('NativeModules'); + function setupDevtools() { var messageListeners = []; var closeListeners = []; - var ws = new window.WebSocket('ws://localhost:8097/devtools'); + var hostname = 'localhost'; + if (Platform.OS === 'android' && NativeModules.AndroidConstants) { + hostname = NativeModules.AndroidConstants.ServerHost.split(':')[0]; + } + var ws = new window.WebSocket('ws://' + hostname + ':8097/devtools'); // this is accessed by the eval'd backend code var FOR_BACKEND = { // eslint-disable-line no-unused-vars resolveRNStyle: require('flattenStyle'),