| Index: cloud_print/cloud_print_resources.gyp
|
| diff --git a/cloud_print/cloud_print_resources.gyp b/cloud_print/cloud_print_resources.gyp
|
| index dfa8bc6418c0a8fe93cdd7a90e86a6972ea062a1..8ed03ac92866a49aac31930c78abd6aea7987c67 100644
|
| --- a/cloud_print/cloud_print_resources.gyp
|
| +++ b/cloud_print/cloud_print_resources.gyp
|
| @@ -6,6 +6,7 @@
|
| 'chromium_code': 1,
|
|
|
| 'variables': {
|
| + 'branding_path': '<(DEPTH)/chrome/app/theme/<(branding_path_component)/BRANDING',
|
| 'version_py_path': '<(DEPTH)/build/util/version.py',
|
| 'version_path': 'VERSION',
|
| },
|
| @@ -19,17 +20,6 @@
|
| {
|
| 'target_name': 'cloud_print_version_resources',
|
| 'type': 'none',
|
| - 'conditions': [
|
| - ['branding == "Chrome"', {
|
| - 'variables': {
|
| - 'branding_path': '<(DEPTH)/chrome/app/theme/google_chrome/BRANDING',
|
| - },
|
| - }, { # else branding!="Chrome"
|
| - 'variables': {
|
| - 'branding_path': '<(DEPTH)/chrome/app/theme/chromium/BRANDING',
|
| - },
|
| - }],
|
| - ],
|
| 'variables': {
|
| 'output_dir': 'cloud_print',
|
| 'template_input_path': '../chrome/app/chrome_version.rc.version',
|
| @@ -56,17 +46,6 @@
|
| {
|
| 'target_name': 'cloud_print_version_header',
|
| 'type': 'none',
|
| - 'conditions': [
|
| - ['branding == "Chrome"', {
|
| - 'variables': {
|
| - 'branding_path': '<(DEPTH)/chrome/app/theme/google_chrome/BRANDING',
|
| - },
|
| - }, { # else branding!="Chrome"
|
| - 'variables': {
|
| - 'branding_path': '<(DEPTH)/chrome/app/theme/chromium/BRANDING',
|
| - },
|
| - }],
|
| - ],
|
| 'hard_dependency': 1,
|
| 'actions': [
|
| {
|
|
|