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

Unified Diff: chrome/chrome_resources.gyp

Issue 1215303006: bluetooth: android: Initial BluetoothDeviceAndroid implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bta-discovery-
Patch Set: Merge TOT Created 5 years, 5 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
Index: chrome/chrome_resources.gyp
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 910e6a3bb53596b9209139e3dcd57b18f47b6fc4..e009f40610949fc86a0ef8cdd8783fd707ee3d5f 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -402,7 +402,7 @@
# GN version: //chrome:packed_resources
'target_name': 'packed_resources',
'type': 'none',
- 'dependencies': [
+ 'dependencies': [ # Update duplicate logic in repack_locales.py
# MSVS needs the dependencies explictly named, Make is able to
# derive the dependencies from the output files.
'chrome_resources',
@@ -446,13 +446,14 @@
],
'conditions': [
['OS != "ios"', {
- 'dependencies': [
+ 'dependencies': [ # Update duplicate logic in repack_locales.py
'<(DEPTH)/content/app/resources/content_resources.gyp:content_resources',
'<(DEPTH)/content/app/strings/content_strings.gyp:content_strings',
+ '<(DEPTH)/device/bluetooth/bluetooth_strings.gyp:device_bluetooth_strings',
'<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
],
}, { # else
- 'dependencies': [
+ 'dependencies': [ # Update duplicate logic in repack_locales.py
'<(DEPTH)/ios/chrome/ios_chrome_resources.gyp:ios_strings_resources_gen',
],
'actions': [
@@ -462,7 +463,7 @@
],
}],
['use_ash==1', {
- 'dependencies': [
+ 'dependencies': [ # Update duplicate logic in repack_locales.py
'<(DEPTH)/ash/ash_resources.gyp:ash_resources',
'<(DEPTH)/ash/ash_strings.gyp:ash_strings',
],
@@ -473,20 +474,19 @@
],
}],
['chromeos==1', {
- 'dependencies': [
+ 'dependencies': [ # Update duplicate logic in repack_locales.py
'<(DEPTH)/remoting/remoting.gyp:remoting_resources',
'<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
'<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
],
}],
['enable_autofill_dialog==1 and OS!="android"', {
- 'dependencies': [
+ 'dependencies': [ # Update duplicate logic in repack_locales.py
'<(DEPTH)/third_party/libaddressinput/libaddressinput.gyp:libaddressinput_strings',
],
}],
['enable_extensions==1', {
- 'dependencies': [
- '<(DEPTH)/device/bluetooth/bluetooth_strings.gyp:device_bluetooth_strings',
+ 'dependencies': [ # Update duplicate logic in repack_locales.py
'<(DEPTH)/extensions/extensions_strings.gyp:extensions_strings',
],
}],

Powered by Google App Engine
This is Rietveld 408576698