diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-10 07:49:49 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-10 07:49:49 +0000 |
| commit | f6d7f8b89f745b24de46dacf5c7cbced535ac179 (patch) | |
| tree | e0c6f87bd814335c7cd134a79703dd9afc56dc89 /chrome/common/descriptors_android.h | |
| parent | 3fb8b90a5007e3e4b377d851369d60f3deb2f4ef (diff) | |
| download | chromium_src-f6d7f8b89f745b24de46dacf5c7cbced535ac179.zip chromium_src-f6d7f8b89f745b24de46dacf5c7cbced535ac179.tar.gz chromium_src-f6d7f8b89f745b24de46dacf5c7cbced535ac179.tar.bz2 | |
Revert 216822 "Remove chrome.pak references, build resources int..."
Broke a variety of Linux, CrOS, and Android bots:
ninja: error: 'gen/repack/chrome.pak', needed by 'chrome.pak', missing and no
known rule to make it
> Remove chrome.pak references, build resources into resources.pak
>
> 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.
>
> R=tony
> TBR=sky
>
> BUG=52609
>
> Review URL: https://chromiumcodereview.appspot.com/22339020
TBR=jamesr@chromium.org
Review URL: https://codereview.chromium.org/22557005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216823 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/descriptors_android.h')
| -rw-r--r-- | chrome/common/descriptors_android.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/common/descriptors_android.h b/chrome/common/descriptors_android.h index f18a8c6..16886e9 100644 --- a/chrome/common/descriptors_android.h +++ b/chrome/common/descriptors_android.h @@ -9,7 +9,8 @@ enum { #if defined(OS_ANDROID) - kAndroidLocalePakDescriptor = kContentIPCDescriptorMax + 1, + kAndroidChromePakDescriptor = kContentIPCDescriptorMax + 1, + kAndroidLocalePakDescriptor, kAndroidChrome100PercentPakDescriptor, kAndroidUIResourcesPakDescriptor, kAndroidMinidumpDescriptor, |