Commit bfca03a3 authored by davileen's avatar davileen Committed by Commit bot

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}
parent d0d1983d
...@@ -121,5 +121,23 @@ ...@@ -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)',
],
}
],
},
],
} }
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
'chrome_java', 'chrome_java',
'chrome_shell_paks', 'chrome_android_paks_copy',
'libchromeshell', 'libchromeshell',
'../media/media.gyp:media_java', '../media/media.gyp:media_java',
], ],
...@@ -128,22 +128,6 @@ ...@@ -128,22 +128,6 @@
], ],
'includes': [ '../build/apk_fake_jar.gypi' ], '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 # GN: //chrome/android:chrome_sync_shell_manifest
'target_name': 'chrome_sync_shell_manifest', 'target_name': 'chrome_sync_shell_manifest',
...@@ -160,7 +144,7 @@ ...@@ -160,7 +144,7 @@
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
'chrome_java', 'chrome_java',
'chrome_shell_paks', 'chrome_android_paks_copy',
'libchromesyncshell', 'libchromesyncshell',
'../media/media.gyp:media_java', '../media/media.gyp:media_java',
'../sync/sync.gyp:sync_java_test_support', '../sync/sync.gyp:sync_java_test_support',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment