Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1217)

Unified Diff: chrome/chrome_shell.gypi

Issue 793943004: Allow chrome_shell_paks target to be reused (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change target name to android Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_android_paks.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_shell.gypi
diff --git a/chrome/chrome_shell.gypi b/chrome/chrome_shell.gypi
index 83bbb9592c1a3e1d5574b20f921828ea535d9a5c..8ef98be31f1ce7cb7a01dbd9e7190e3b3a59c956 100644
--- a/chrome/chrome_shell.gypi
+++ b/chrome/chrome_shell.gypi
@@ -108,7 +108,7 @@
'type': 'none',
'dependencies': [
'chrome_java',
- 'chrome_shell_paks',
+ 'chrome_android_paks_copy',
'libchromeshell',
'../media/media.gyp:media_java',
],
@@ -142,22 +142,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',
@@ -173,7 +157,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',
« no previous file with comments | « chrome/chrome_android_paks.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698