diff options
| author | davileen <davileen@amazon.com> | 2015-01-23 15:22:22 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-23 23:23:45 +0000 |
| commit | bfca03a38e414405b50007e13c9e2c9cf3604049 (patch) | |
| tree | a2ae8b73583d65bcc8b76839d6c51c43516f24c4 | |
| parent | d0d1983dce224ca3396140571f19e7207f791592 (diff) | |
| download | chromium_src-bfca03a38e414405b50007e13c9e2c9cf3604049.zip chromium_src-bfca03a38e414405b50007e13c9e2c9cf3604049.tar.gz chromium_src-bfca03a38e414405b50007e13c9e2c9cf3604049.tar.bz2 | |
Allow chrome_shell_paks target to be reused
Currently, when multiple downstream targets depend on chrome_shell resource
paks, ninja outputs several warnings similar to:
ninja: warning: multiple rules generate ../assets/sample_apk/am.pak. builds involving this target will not be correct; continuing anyway
ninja: warning: multiple rules generate ../assets/sample_apk/ar.pak. builds involving this target will not be correct; continuing anyway
This commit refactors the pak copying logic into chrome_android_paks.gypi to
allow proper reuse of the target.
BUG=441011
Review URL: https://codereview.chromium.org/793943004
Cr-Commit-Position: refs/heads/master@{#312960}
| -rw-r--r-- | chrome/chrome_android_paks.gypi | 18 | ||||
| -rw-r--r-- | chrome/chrome_shell.gypi | 20 |
2 files changed, 20 insertions, 18 deletions
diff --git a/chrome/chrome_android_paks.gypi b/chrome/chrome_android_paks.gypi index 574d5cc..13f5845 100644 --- a/chrome/chrome_android_paks.gypi +++ b/chrome/chrome_android_paks.gypi @@ -121,5 +121,23 @@ }], ], }, + 'targets': [ + { + 'target_name': 'chrome_android_paks_copy', + 'type': 'none', + 'dependencies': [ + '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources', + '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources', + ], + 'copies': [ + { + 'destination': '<(chrome_android_pak_output_folder)', + 'files': [ + '<@(chrome_android_pak_input_resources)', + ], + } + ], + }, + ], } diff --git a/chrome/chrome_shell.gypi b/chrome/chrome_shell.gypi index 247ae5e..2de7f00 100644 --- a/chrome/chrome_shell.gypi +++ b/chrome/chrome_shell.gypi @@ -95,7 +95,7 @@ 'type': 'none', 'dependencies': [ 'chrome_java', - 'chrome_shell_paks', + 'chrome_android_paks_copy', 'libchromeshell', '../media/media.gyp:media_java', ], @@ -129,22 +129,6 @@ 'includes': [ '../build/apk_fake_jar.gypi' ], }, { - 'target_name': 'chrome_shell_paks', - 'type': 'none', - 'dependencies': [ - '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources', - '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources', - ], - 'copies': [ - { - 'destination': '<(chrome_android_pak_output_folder)', - 'files': [ - '<@(chrome_android_pak_input_resources)', - ], - } - ], - }, - { # GN: //chrome/android:chrome_sync_shell_manifest 'target_name': 'chrome_sync_shell_manifest', 'type': 'none', @@ -160,7 +144,7 @@ 'type': 'none', 'dependencies': [ 'chrome_java', - 'chrome_shell_paks', + 'chrome_android_paks_copy', 'libchromesyncshell', '../media/media.gyp:media_java', '../sync/sync.gyp:sync_java_test_support', |