From 5db2b749d3f5d907fc490baa4bd5935dc21737d4 Mon Sep 17 00:00:00 2001 From: "jamesr@chromium.org" Date: Fri, 23 Aug 2013 05:33:09 +0000 Subject: Remove chrome.pak references, build resources into resources.pak (try 2) This puts resources that used to be in chrome.pak and/or compiled in to chrome.dll into resources.pak. resources.pak is already loaded at startup on all platforms so having some resources in a separate pak file isn't beneficial. This previously landed as https://codereview.chromium.org/22339020 and was reverted due to various scripts/etc still referencing chrome.pak. This patch still builds chrome.pak, but with only the (tiny) net_resources in it. After this lands I'll go remove references to chrome.pak and then remove it completely once all references are gone. BUG=52609 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=218956 R=phajdan.jr@chromium.org, sky@chromium.org, tony@chromium.org Review URL: https://codereview.chromium.org/23205023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219226 0039d316-1c4b-4281-b951-d872f2087c98 --- .../chrome/testshell/ChromiumTestShellApplication.java | 1 - chrome/app/chrome_main_delegate.cc | 1 - chrome/browser/chrome_content_browser_client.cc | 10 ++-------- chrome/browser_tests.isolate | 1 - chrome/chrome.isolate | 1 - chrome/chrome_android_paks.gypi | 2 -- chrome/chrome_dll_bundle.gypi | 1 - chrome/chrome_installer.gypi | 1 - chrome/chrome_ios_bundle_resources.gypi | 1 - chrome/chrome_repack_chrome.gypi | 17 ----------------- chrome/chrome_repack_resources.gypi | 18 +++++++++++++++--- chrome/chrome_resources.gyp | 1 + chrome/common/descriptors_android.h | 3 +-- chrome/installer/linux/common/installer.include | 1 - chrome/interactive_ui_tests.isolate | 1 - chrome/sync_integration_tests.isolate | 1 - chrome/tools/build/chromeos/FILES.cfg | 4 ---- chrome/tools/build/linux/FILES.cfg | 4 ---- chrome/unit_tests.isolate | 3 --- 19 files changed, 19 insertions(+), 53 deletions(-) (limited to 'chrome') diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellApplication.java b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellApplication.java index acbee24..ba09992 100644 --- a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellApplication.java +++ b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellApplication.java @@ -20,7 +20,6 @@ import java.util.ArrayList; public class ChromiumTestShellApplication extends Application { private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "chromiumtestshell"; private static final String[] CHROME_MANDATORY_PAKS = { - "chrome.pak", "en-US.pak", "resources.pak", "chrome_100_percent.pak", diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc index 623b20a..b041077 100644 --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc @@ -667,7 +667,6 @@ void ChromeMainDelegate::PreSandboxStartup() { ResourceBundle::InitSharedInstanceWithPakFile(locale_pak_fd, false); int extra_pak_keys[] = { - kAndroidChromePakDescriptor, kAndroidChrome100PercentPakDescriptor, kAndroidUIResourcesPakDescriptor, }; diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index e3e1e69..380aa2a 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -2443,16 +2443,10 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( DCHECK(!data_path.empty()); int flags = base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ; - base::FilePath chrome_pak = data_path.AppendASCII("chrome.pak"); - base::PlatformFile f = - base::CreatePlatformFile(chrome_pak, flags, NULL, NULL); - DCHECK(f != base::kInvalidPlatformFileValue); - mappings->push_back(FileDescriptorInfo(kAndroidChromePakDescriptor, - FileDescriptor(f, true))); - base::FilePath chrome_resources_pak = data_path.AppendASCII("chrome_100_percent.pak"); - f = base::CreatePlatformFile(chrome_resources_pak, flags, NULL, NULL); + base::PlatformFile f = + base::CreatePlatformFile(chrome_resources_pak, flags, NULL, NULL); DCHECK(f != base::kInvalidPlatformFileValue); mappings->push_back(FileDescriptorInfo(kAndroidChrome100PercentPakDescriptor, FileDescriptor(f, true))); diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate index 1842deb..a43a861 100644 --- a/chrome/browser_tests.isolate +++ b/chrome/browser_tests.isolate @@ -14,7 +14,6 @@ ], 'isolate_dependency_tracked': [ '../testing/xvfb.py', - '<(PRODUCT_DIR)/chrome.pak', '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/libclearkeycdm.so', '<(PRODUCT_DIR)/libclearkeycdmadapter.so', diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate index 86233c4..263a82c 100644 --- a/chrome/chrome.isolate +++ b/chrome/chrome.isolate @@ -6,7 +6,6 @@ ['OS=="linux"', { 'variables': { 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/chrome.pak', '<(PRODUCT_DIR)/libclearkeycdm.so', '<(PRODUCT_DIR)/libclearkeycdmadapter.so', '<(PRODUCT_DIR)/libffmpegsumo.so', diff --git a/chrome/chrome_android_paks.gypi b/chrome/chrome_android_paks.gypi index 6a95ee5..7937f2f 100644 --- a/chrome/chrome_android_paks.gypi +++ b/chrome/chrome_android_paks.gypi @@ -5,7 +5,6 @@ 'variables': { 'chrome_android_pak_output_folder': '<@(PRODUCT_DIR)/../assets/<(package_name)', 'chrome_android_pak_input_resources': [ - '<(PRODUCT_DIR)/chrome.pak', '<(PRODUCT_DIR)/resources.pak', '<(PRODUCT_DIR)/chrome_100_percent.pak', '<(PRODUCT_DIR)/locales/am.pak', @@ -54,7 +53,6 @@ '<(PRODUCT_DIR)/locales/zh-TW.pak', ], 'chrome_android_pak_output_resources': [ - '<(chrome_android_pak_output_folder)/chrome.pak', '<(chrome_android_pak_output_folder)/resources.pak', '<(chrome_android_pak_output_folder)/chrome_100_percent.pak', '<(chrome_android_pak_output_folder)/am.pak', diff --git a/chrome/chrome_dll_bundle.gypi b/chrome/chrome_dll_bundle.gypi index 9b8d1af..57bd2b9 100644 --- a/chrome/chrome_dll_bundle.gypi +++ b/chrome/chrome_dll_bundle.gypi @@ -61,7 +61,6 @@ 'app/theme/menu_overflow_down.pdf', 'app/theme/menu_overflow_up.pdf', 'browser/mac/install.sh', - '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak', '