diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 17:55:12 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 17:55:12 +0000 |
| commit | e7863bc0241642fd5c03bcf6db8a06a3e1156e72 (patch) | |
| tree | dcf4fd3627a1b4a11e612ae999c5783120536316 | |
| parent | 2f27389d00c8ce39db8e5dbd81d4ae3e60f07f56 (diff) | |
| download | chromium_src-e7863bc0241642fd5c03bcf6db8a06a3e1156e72.zip chromium_src-e7863bc0241642fd5c03bcf6db8a06a3e1156e72.tar.gz chromium_src-e7863bc0241642fd5c03bcf6db8a06a3e1156e72.tar.bz2 | |
[Android] Remove build specs that were needed downstream.
The downstream patch has landed, we can now remove the leftovers.
BUG=163955
R=torne@chromium.org
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/11438043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171527 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/chrome_android.gypi | 24 | ||||
| -rw-r--r-- | chrome/chrome_android_paks.gypi | 8 |
2 files changed, 0 insertions, 32 deletions
diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi index ba4a928..d6c3e01 100644 --- a/chrome/chrome_android.gypi +++ b/chrome/chrome_android.gypi @@ -138,29 +138,5 @@ } ], }, - # This target is left out to avoid breaking downstream Chrome for Android - # build. It will be removed once the corresponding downstream change will - # land. - # crbug.com/163955 - { - 'target_name': 'chrome_android_paks', - 'type': 'none', - 'dependencies': [ - '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources', - '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources', - ], - 'variables': { - 'package_name': 'chrome', - }, - 'includes': [ - 'chrome_android_paks.gypi', - ], - 'copies': [ - { - 'destination': '<(chrome_android_pak_output_folder)', - 'files': [ '<@(chrome_android_pak_input_resources)' ], - } - ], - }, ], } diff --git a/chrome/chrome_android_paks.gypi b/chrome/chrome_android_paks.gypi index 967cb70..fa7781e 100644 --- a/chrome/chrome_android_paks.gypi +++ b/chrome/chrome_android_paks.gypi @@ -3,14 +3,6 @@ # found in the LICENSE file. { 'variables': { - # This variable is left out to avoid breaking downstream Chrome for Android - # build. It will be removed once the corresponding downstream change will - # land. - # crbug.com/163955 - 'variables': { - 'package_name%': 'chrome', - }, - 'chrome_android_pak_output_folder': '<@(PRODUCT_DIR)/../assets/<(package_name)', 'chrome_android_pak_input_resources': [ '<(PRODUCT_DIR)/chrome.pak', |