commit feac222a34ecb675c68feda76e33e516c00e6cef
author Bertrand SIMONNET <bsimonnet@chromium.org> Wed May 28 23:22:43 2014
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Sat May 31 01:46:42 2014
tree 8e005695b69b415c1ec0aef4c73a9a722390cfe7
parent 09e78dd65482ce54cc8f2b1caf5560850bf52fbe

libchromeos: Update gyp file to use src/platform2/common-mk

We are moving the packages built by platform2's ebuild into src/platform2.
We need packages to use src/platform2/common-mk instead of
src/platform/common-mk.

BUG=chromium:378554
TEST=emerge-daisy platform2
TEST=trybot run on daisy, link, mario and duck

CQ-DEPEND=CL:201938

Change-Id: I08ca77f5e21d42940e679a5c9277e7fe4bf2c5bd
Reviewed-on: https://chromium-review.googlesource.com/201969
Tested-by: Bertrand Simonnet <bsimonnet@chromium.org>
Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org>
Commit-Queue: Bertrand Simonnet <bsimonnet@chromium.org>

libchromeos.gypi

diff --git a/libchromeos.gypi b/libchromeos.gypi
index 08e551a..af4574f 100644
--- a/libchromeos.gypi
+++ b/libchromeos.gypi
@@ -26,7 +26,7 @@
           '../libchromeos',
         ],
       },
-      'includes': ['../common-mk/deps.gypi'],
+      'includes': ['../../platform2/common-mk/deps.gypi'],
     },
     {
       'target_name': 'libchromeos-core-<(libbase_ver)',
@@ -88,7 +88,7 @@
       'type': 'shared_library',
       'dependencies': [
         '../libchromeos/libpolicy.gyp:*',
-        '../common-mk/external_dependencies.gyp:policy-protos',
+        '../../platform2/common-mk/external_dependencies.gyp:policy-protos',
       ],
       'variables': {
         'exported_deps': [
@@ -122,7 +122,7 @@
           'target_name': 'libchromeos-<(libbase_ver)_unittests',
           'type': 'executable',
           'dependencies': ['libchromeos-<(libbase_ver)'],
-          'includes': ['../common-mk/common_test.gypi'],
+          'includes': ['../../platform2/common-mk/common_test.gypi'],
           'cflags': [
             '-Wno-format-zero-length',
           ],
@@ -150,7 +150,7 @@
           'target_name': 'libpolicy-<(libbase_ver)_unittests',
           'type': 'executable',
           'dependencies': ['libpolicy-<(libbase_ver)'],
-          'includes': ['../common-mk/common_test.gypi'],
+          'includes': ['../../platform2/common-mk/common_test.gypi'],
           'sources': [
             'chromeos/policy/tests/libpolicy_unittest.cc',
           ]