commit 8e2cc5885443e7f51631f0a756db15068be7e5ba
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:01 2014
tree b340edb52cc90b4e8dce2958c3d30d504b2b0728
parent b3a8c3b08da54a13be0025c0cf6d49ee2b0f2304

chaps: 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: Iaa2460d6fc79933aaea265a85f46de24d7e79983
Reviewed-on: https://chromium-review.googlesource.com/201954
Tested-by: Bertrand Simonnet <bsimonnet@chromium.org>
Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org>
Commit-Queue: Bertrand Simonnet <bsimonnet@chromium.org>

chaps.gyp

diff --git a/chaps.gyp b/chaps.gyp
index dcd74c7..98893b4 100644
--- a/chaps.gyp
+++ b/chaps.gyp
@@ -26,7 +26,7 @@
       'sources': [
         '<(proto_in_dir)/attributes.proto',
       ],
-      'includes': ['../common-mk/protoc.gypi'],
+      'includes': ['../../platform2/common-mk/protoc.gypi'],
     },
     {
       'target_name': 'chaps-proxies',
@@ -39,7 +39,7 @@
       'sources': [
         '<(xml2cpp_in_dir)/chaps_interface.xml',
       ],
-      'includes': ['../common-mk/xml2cpp.gypi'],
+      'includes': ['../../platform2/common-mk/xml2cpp.gypi'],
     },
     {
       'target_name': 'chaps-adaptors',
@@ -52,7 +52,7 @@
       'sources': [
         '<(xml2cpp_in_dir)/chaps_interface.xml',
       ],
-      'includes': ['../common-mk/xml2cpp.gypi'],
+      'includes': ['../../platform2/common-mk/xml2cpp.gypi'],
     },
     {
       # This is meant only for internal binaries like unittests.  All
@@ -170,7 +170,7 @@
           'target_name': 'chaps_test',
           'type': 'executable',
           'dependencies': ['libchaps_static'],
-          'includes': ['../common-mk/common_test.gypi'],
+          'includes': ['../../platform2/common-mk/common_test.gypi'],
           'sources': [
             'chaps_test.cc',
           ]
@@ -182,7 +182,7 @@
             'libchaps_static',
             'libchaps_test',
           ],
-          'includes': ['../common-mk/common_test.gypi'],
+          'includes': ['../../platform2/common-mk/common_test.gypi'],
           'sources': [
             'chaps_service.cc',
             'chaps_service_test.cc',
@@ -195,7 +195,7 @@
             'libchaps_static',
             'libchaps_test',
           ],
-          'includes': ['../common-mk/common_test.gypi'],
+          'includes': ['../../platform2/common-mk/common_test.gypi'],
           'sources': [
             'slot_manager_impl.cc',
             'slot_manager_test.cc',
@@ -208,7 +208,7 @@
             'libchaps_static',
             'libchaps_test',
           ],
-          'includes': ['../common-mk/common_test.gypi'],
+          'includes': ['../../platform2/common-mk/common_test.gypi'],
           'sources': [
             'session_impl.cc',
             'session_test.cc',
@@ -221,7 +221,7 @@
             'libchaps_static',
             'libchaps_test',
           ],
-          'includes': ['../common-mk/common_test.gypi'],
+          'includes': ['../../platform2/common-mk/common_test.gypi'],
           'sources': [
             'object_impl.cc',
             'object_test.cc',
@@ -234,7 +234,7 @@
             'libchaps_static',
             'libchaps_test',
           ],
-          'includes': ['../common-mk/common_test.gypi'],
+          'includes': ['../../platform2/common-mk/common_test.gypi'],
           'sources': [
             'object_policy_common.cc',
             'object_policy_data.cc',
@@ -253,7 +253,7 @@
             'libchaps_static',
             'libchaps_test',
           ],
-          'includes': ['../common-mk/common_test.gypi'],
+          'includes': ['../../platform2/common-mk/common_test.gypi'],
           'sources': [
             'object_pool_impl.cc',
             'object_pool_test.cc',
@@ -270,7 +270,7 @@
             '-lleveldb',
             '-lmemenv',
           ],
-          'includes': ['../common-mk/common_test.gypi'],
+          'includes': ['../../platform2/common-mk/common_test.gypi'],
           'sources': [
             'object_store_impl.cc',
             'object_store_test.cc',
@@ -284,7 +284,7 @@
             'libchaps_test',
             '../metrics/libmetrics-<(libbase_ver).gyp:libmetrics-<(libbase_ver)',
           ],
-          'includes': ['../common-mk/common_test.gypi'],
+          'includes': ['../../platform2/common-mk/common_test.gypi'],
           'sources': [
             'opencryptoki_importer.cc',
             'opencryptoki_importer_test.cc',
@@ -298,7 +298,7 @@
             'libchaps_test',
             '../metrics/libmetrics-<(libbase_ver).gyp:libmetrics-<(libbase_ver)',
           ],
-          'includes': ['../common-mk/common_test.gypi'],
+          'includes': ['../../platform2/common-mk/common_test.gypi'],
           'sources': [
             'token_file_manager_chromeos.cc',
             'isolate_login_client.cc',
@@ -325,7 +325,7 @@
               'dependencies': [
                 'libchaps_static',
               ],
-              'includes': ['../common-mk/common_test.gypi'],
+              'includes': ['../../platform2/common-mk/common_test.gypi'],
               'sources': [
                 'chapsd_test.cc',
                 'chaps_service_redirect.cc',
@@ -338,7 +338,7 @@
                 'libchaps_static',
                 'libchaps_test',
               ],
-              'includes': ['../common-mk/common_test.gypi'],
+              'includes': ['../../platform2/common-mk/common_test.gypi'],
               'sources': [
                 'tpm_utility_impl.cc',
                 'tpm_utility_test.cc',