commit 331b5b4c6acdc7e78621da38a4b95e831c024682
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 fa2d3492c3baf33f6c99b9ae4df787fb2261d3fd
parent 5777690fb2291a468715eabfcc6f7aac6f1678cd

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>

shill.gyp

diff --git a/shill.gyp b/shill.gyp
index 8bc7077..49653fe 100644
--- a/shill.gyp
+++ b/shill.gyp
@@ -54,7 +54,7 @@
       'sources': [
         '<(proto_in_dir)/mobile_operator_db.proto'
       ],
-      'includes': ['../../platform2/common-mk/protoc.gypi'],
+      'includes': ['../common-mk/protoc.gypi'],
     },
     {
       'target_name': 'mobile_operator_db-db',
@@ -69,7 +69,7 @@
       'sources': [
         '<(protoc_text_dir)/serviceproviders.prototxt',
       ],
-      'includes': ['../../platform2/common-mk/protoctxt.gypi'],
+      'includes': ['../common-mk/protoctxt.gypi'],
     },
     {
       'target_name': 'mobile_operator_db',
@@ -111,7 +111,7 @@
           ],
         }],
       ],
-      'includes': ['../../platform2/common-mk/xml2cpp.gypi'],
+      'includes': ['../common-mk/xml2cpp.gypi'],
     },
     {
       'target_name': 'shill-adaptors',
@@ -129,7 +129,7 @@
         '<(xml2cpp_in_dir)/org.chromium.flimflam.Service.xml',
         '<(xml2cpp_in_dir)/org.chromium.flimflam.Task.xml',
       ],
-      'includes': ['../../platform2/common-mk/xml2cpp.gypi'],
+      'includes': ['../common-mk/xml2cpp.gypi'],
     },
     {
       'target_name': 'shim-protos',
@@ -141,7 +141,7 @@
       'sources': [
         '<(proto_in_dir)/crypto_util.proto',
       ],
-      'includes': ['../../platform2/common-mk/protoc.gypi'],
+      'includes': ['../common-mk/protoc.gypi'],
     },
     {
       'target_name': 'crypto_util',
@@ -210,7 +210,7 @@
       'conditions': [
         ['USE_cellular == 1', {
           'dependencies': [
-            '../../platform2/common-mk/external_dependencies.gyp:modemmanager-dbus-proxies',
+            '../common-mk/external_dependencies.gyp:modemmanager-dbus-proxies',
           ],
           'variables': {
             'deps': [
@@ -514,7 +514,7 @@
           'target_name': 'shill_unittest',
           'type': 'executable',
           'dependencies': ['libshill'],
-          'includes': ['../../platform2/common-mk/common_test.gypi'],
+          'includes': ['../common-mk/common_test.gypi'],
           'variables': {
             'deps': [
               'libnetfilter_queue',