Changed location of LibsecretLoader

components/os_crypt.gypi

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'os_crypt',
       'type': 'static_library',
       'include_dirs': [
@@ skipping 32 matching lines @@
             },
           },
           'msvs_settings': {
             'VCLinkerTool': {
               'AdditionalDependencies': [
                 'crypt32.lib',
               ],
             },
           },
         }],
+        ['OS=="linux" and chromeos!=1', {
+          'sources': [ 
+            'os_crypt/os_crypt_posix_util_libsecret.cc',
+            'os_crypt/os_crypt_posix_util_libsecret.h',
+          ],
+          'defines': [
+            'USE_LIBSECRET',
+          ],
+          'include_dirs' : [

[Lei Zhang, 2016/04/28 21:49:09]

There's a slight discrepancy - here we have include_dirs, but in GN we have a
dependency. What's up with that?

[vabr (Chromium), 2016/04/29 07:36:45]

It is a shortcut, given that GYP is just being deprecated on Linux. The separate
target for libsecret we have in GN will be useful if we start depending on it
somewhere else. But that's unlikely to happen in the time remaining for GYP on
Linux. Please speak up if you don't think this is a good idea and would prefer
to have a dependency in GYP as well. In that case we would need to add a GYP
configuration there as well.

[Lei Zhang, 2016/04/29 16:37:26]

Ok, I won't worry about it given GYP deprecation on Linux.

+            '../third_party/libsecret/'
+          ],
+        }],
       ],
       'target_conditions': [
         ['OS=="ios"', {
           'sources/': [
             ['include', '^os_crypt/keychain_password_mac\\.mm$'],
             ['include', '^os_crypt/os_crypt_mac\\.mm$'],
           ],
         }],
       ],
     },
   ],
 }