summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_browser_chromeos.gypi
diff options
context:
space:
mode:
authormnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-26 11:13:41 +0000
committermnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-26 11:13:41 +0000
commit5f4a3c3e2a2e4545558f7c181cc1b540e0e3e192 (patch)
treeb4427e705a39daff05cb3cb764a1817c1890adce /chrome/chrome_browser_chromeos.gypi
parent0b16b8299f4e4585af3c16ad709a959de0277b45 (diff)
downloadchromium_src-5f4a3c3e2a2e4545558f7c181cc1b540e0e3e192.zip
chromium_src-5f4a3c3e2a2e4545558f7c181cc1b540e0e3e192.tar.gz
chromium_src-5f4a3c3e2a2e4545558f7c181cc1b540e0e3e192.tar.bz2
Move proto files back into chrome/browser/policy/proto
The chrome/browser/policy/proto.git repo was broken due to the moves, and pulling proto files from several paths in the Chrome tree into the Chrome OS build adds complexity. Hence, move back the proto files to chrome/browser/policy/proto/{cloud,chromeos}. BUG=None TEST=Compiles and passes tests. TBR=sky@chromium.org, nkostylev@chromium.org Review URL: https://codereview.chromium.org/14008005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196698 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser_chromeos.gypi')
-rw-r--r--chrome/chrome_browser_chromeos.gypi8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 6f30e0d..400371b 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -884,12 +884,12 @@
'target_name': 'device_policy_proto',
'type': 'static_library',
'sources': [
- 'browser/chromeos/policy/proto/chrome_device_policy.proto',
- 'browser/chromeos/policy/proto/install_attributes.proto',
+ 'browser/policy/proto/chromeos/chrome_device_policy.proto',
+ 'browser/policy/proto/chromeos/install_attributes.proto',
],
'variables': {
- 'proto_in_dir': 'browser/chromeos/policy/proto',
- 'proto_out_dir': 'chrome/browser/chromeos/policy/proto',
+ 'proto_in_dir': 'browser/policy/proto/chromeos',
+ 'proto_out_dir': 'chrome/browser/policy/proto/chromeos',
},
'includes': [ '../build/protoc.gypi' ]
},