third_party/polymer/v1_0/components-chromium/carbon-route/compiled_resources2.gyp - Issue 1862213002: Roll third_party/polymer.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/polymer/v1_0/components-chromium/carbon-route/compiled_resources2.gyp

Issue 1862213002: Roll third_party/polymer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove obsolete appearance_browsertest.js, result of a previous bad merge. Created 4 years, 8 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 | « third_party/polymer/v1_0/components-chromium/carbon-route/carbon-route-extracted.js ('k') | third_party/polymer/v1_0/components-chromium/iron-a11y-announcer/bower.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/polymer/v1_0/components-chromium/carbon-route/compiled_resources2.gyp

diff --git a/third_party/polymer/v1_0/components-chromium/iron-test-helpers/compiled_resources2.gyp b/third_party/polymer/v1_0/components-chromium/carbon-route/compiled_resources2.gyp

similarity index 56%

copy from third_party/polymer/v1_0/components-chromium/iron-test-helpers/compiled_resources2.gyp

copy to third_party/polymer/v1_0/components-chromium/carbon-route/compiled_resources2.gyp

index 908da766ad4e55113c27ab2d65c07e5ca7548ccb..d6d8aabd08249927f9150ed5755153ac60faf9f3 100644

--- a/third_party/polymer/v1_0/components-chromium/iron-test-helpers/compiled_resources2.gyp

+++ b/third_party/polymer/v1_0/components-chromium/carbon-route/compiled_resources2.gyp

@@ -6,15 +6,20 @@

{

'targets': [

{

- 'target_name': 'iron-test-helpers-extracted',

+ 'target_name': 'carbon-location-extracted',

+ 'dependencies': [

+ '../iron-location/compiled_resources2.gyp:iron-location-extracted',

+ '../iron-location/compiled_resources2.gyp:iron-query-params-extracted',

+ 'carbon-route-converter-extracted',

+ ],

'includes': ['../../../../closure_compiler/compile_js2.gypi'],

{

- 'target_name': 'mock-interactions-extracted',

+ 'target_name': 'carbon-route-converter-extracted',

'includes': ['../../../../closure_compiler/compile_js2.gypi'],

{

- 'target_name': 'test-helpers-extracted',

+ 'target_name': 'carbon-route-extracted',

'includes': ['../../../../closure_compiler/compile_js2.gypi'],