From 489b98bf1006818ba985e93478a088c0e1e1aae7 Mon Sep 17 00:00:00 2001
From: Yujie Liu <yujiel@fb.com>
Date: Thu, 21 Dec 2017 12:01:02 -0800
Subject: [PATCH] remove embeddedBundleURL

Reviewed By: fromcelticpark

Differential Revision: D6502049

fbshipit-source-id: 31a611cea4c017877c3ce2f7e9a3503723af4c2d
---
 Libraries/Image/AssetSourceResolver.js | 17 -----------------
 Libraries/Image/resolveAssetSource.js  |  9 +--------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/Libraries/Image/AssetSourceResolver.js b/Libraries/Image/AssetSourceResolver.js
index 4b4e4117f..0869c39e4 100644
--- a/Libraries/Image/AssetSourceResolver.js
+++ b/Libraries/Image/AssetSourceResolver.js
@@ -52,19 +52,15 @@ class AssetSourceResolver {
   serverUrl: ?string;
   // where the jsbundle is being run from
   jsbundleUrl: ?string;
-  // where the embedded bundle in the app is stored
-  embeddedBundleUrl: ?string;
   // the asset to resolve
   asset: PackagerAsset;
 
   constructor(serverUrl: ?string,
     jsbundleUrl: ?string,
-    embeddedBundleUrl: ?string,
     asset: PackagerAsset
   ) {
     this.serverUrl = serverUrl;
     this.jsbundleUrl = jsbundleUrl;
-    this.embeddedBundleUrl = embeddedBundleUrl;
     this.asset = asset;
   }
 
@@ -76,10 +72,6 @@ class AssetSourceResolver {
     return !!(this.jsbundleUrl && this.jsbundleUrl.startsWith('file://'));
   }
 
-  canLoadFromEmbeddedBundledLocation(): boolean {
-    return !!this.embeddedBundleUrl;
-  }
-
   defaultAsset(): ResolvedAssetSource {
     if (this.isLoadedFromServer()) {
       return this.assetServerURL();
@@ -123,15 +115,6 @@ class AssetSourceResolver {
     return this.fromSource(path + getScaledAssetPath(this.asset));
   }
 
-  /**
-   * Resolves to the asset that was bundled with the app, with a scaled asset filename
-   * E.g. 'file:///sdcard/bundle/assets/AwesomeModule/icon@2x.png'
-   */
-  scaledAssetURLInEmbeddedBundleUrl(): ResolvedAssetSource {
-    const path = this.embeddedBundleUrl || 'file://';
-    return this.fromSource(path + getScaledAssetPath(this.asset));
-  }
-
   /**
    * The default location of assets bundled with the app, located by
    * resource identifier
diff --git a/Libraries/Image/resolveAssetSource.js b/Libraries/Image/resolveAssetSource.js
index 73b391261..0aaa7978f 100644
--- a/Libraries/Image/resolveAssetSource.js
+++ b/Libraries/Image/resolveAssetSource.js
@@ -19,7 +19,7 @@ const NativeModules = require('NativeModules');
 
 import type { ResolvedAssetSource } from 'AssetSourceResolver';
 
-let _customSourceTransformer, _serverURL, _scriptURL, _embeddedBundleURL;
+let _customSourceTransformer, _serverURL, _scriptURL;
 
 function getDevServerURL(): ?string {
   if (_serverURL === undefined) {
@@ -60,12 +60,6 @@ function getScriptURL(): ?string {
   return _scriptURL;
 }
 
-function getEmbeddedBundledURL(): ?string {
-  const scriptURL = NativeModules.SourceCode.embeddedBundleURL;
-  _embeddedBundleURL = _coerceLocalScriptURL(scriptURL);
-  return _embeddedBundleURL;
-}
-
 function setCustomSourceTransformer(
   transformer: (resolver: AssetSourceResolver) => ResolvedAssetSource,
 ): void {
@@ -89,7 +83,6 @@ function resolveAssetSource(source: any): ?ResolvedAssetSource {
   const resolver = new AssetSourceResolver(
     getDevServerURL(),
     getScriptURL(),
-    getEmbeddedBundledURL(),
     asset,
   );
   if (_customSourceTransformer) {