commit dfea2f8992e9f909634b9af6f1481a6b2f08cdc2
author Alex Deymo <deymo@chromium.org> Wed Sep 24 11:09:43 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Sep 25 04:10:00 2014 +0000
tree 47ecff03b6923bec8e1d282e25bd48158f0348e0
parent dc1ef3c356922a77e96873f94342966890038d3f

Remove '../platform2/' from platform2 relative paths in gyp files.

The paths in platform2 gyp files are relative to the gyp file so they
don't require to have '../platform2/' in them.

BUG=None
TEST=cbuildbot amd64-generic-full arm-generic-full

Change-Id: I4da32969fc4956df14e9d3685f790565cd33d20f
Reviewed-on: https://chromium-review.googlesource.com/219788
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Alex Deymo <deymo@chromium.org>
Tested-by: Alex Deymo <deymo@chromium.org>

metrics/metrics.gyp

diff --git a/metrics/metrics.gyp b/metrics/metrics.gyp
index b5c3561..c6c7ffe 100644
--- a/metrics/metrics.gyp
+++ b/metrics/metrics.gyp
@@ -104,7 +104,7 @@
         '<(proto_in_dir)/user_action_event.proto',
       ],
       'includes': [
-        '../../platform2/common-mk/protoc.gypi'
+        '../common-mk/protoc.gypi'
       ],
     },
   ],
@@ -123,7 +123,7 @@
         {
           'target_name': 'persistent_integer_test',
           'type': 'executable',
-          'includes': ['../../platform2/common-mk/common_test.gypi'],
+          'includes': ['../common-mk/common_test.gypi'],
           'sources': [
             'persistent_integer.cc',
             'persistent_integer_test.cc',
@@ -135,7 +135,7 @@
           'dependencies': [
             '../metrics/libmetrics-<(libbase_ver).gyp:libmetrics-<(libbase_ver)',
           ],
-          'includes': ['../../platform2/common-mk/common_test.gypi'],
+          'includes': ['../common-mk/common_test.gypi'],
           'sources': [
             'metrics_library_test.cc',
           ],
@@ -148,7 +148,7 @@
         {
           'target_name': 'timer_test',
           'type': 'executable',
-          'includes': ['../../platform2/common-mk/common_test.gypi'],
+          'includes': ['../common-mk/common_test.gypi'],
           'sources': [
             'timer.cc',
             'timer_test.cc',
@@ -166,7 +166,7 @@
             'libupload_service',
           ],
           'includes':[
-            '../../platform2/common-mk/common_test.gypi',
+            '../common-mk/common_test.gypi',
           ],
           'include_dirs': ['.']
         },
@@ -180,7 +180,7 @@
           'dependencies': [
             'libmetrics_daemon',
           ],
-          'includes': ['../../platform2/common-mk/common_test.gypi'],
+          'includes': ['../common-mk/common_test.gypi'],
           'sources': [
             'metrics_daemon_test.cc',
           ],