trunks: Build from AOSP

This CL allows for trunks to compile from its new source code location.
This CL also removes the common.mk symbolic link from trunks source code
directories.

Bug: 23901950
TEST=emerge-rambi trunks

Change-Id: Ie3e60b7183afe7e4b8a622ad58bf1252803099dc

2 files changed, 8 insertions, 4 deletions

diff --git a/common.mk b/common.mk
deleted file mode 120000
index 126e5b8..0000000
--- a/common.mk
+++ /dev/null
@@ -1 +0,0 @@
-../common-mk/common.mk
\ No newline at end of file
diff --git a/trunks.gyp b/trunks.gyp
index 2d3b275..d162f9a 100644
--- a/trunks.gyp
+++ b/trunks.gyp
@@ -16,7 +16,7 @@
 
 {
   'target_defaults': {
-    'includes': ['../common-mk/common.gypi'],
+    'includes': ['../../../platform2/common-mk/common.gypi'],
     'variables': {
       'deps': [  # This is a list of pkg-config dependencies
         'libchrome-<(libbase_ver)',
@@ -25,6 +25,11 @@
         'protobuf-lite',
       ],
     },
+    'include_dirs': [
+      # We need this include dir because we include all the local code as
+      # "trunks/...".
+      '<(platform2_root)/../aosp/system/',
+    ],
   },
   'targets': [
     {
@@ -37,7 +42,7 @@
       'sources': [
         '<(proto_in_dir)/dbus_interface.proto',
       ],
-      'includes': ['../common-mk/protoc.gypi'],
+      'includes': ['../../../platform2/common-mk/protoc.gypi'],
     },
     {
       'target_name': 'trunks',
@@ -134,7 +139,7 @@
         {
           'target_name': 'trunks_testrunner',
           'type': 'executable',
-          'includes': ['../common-mk/common_test.gypi'],
+          'includes': ['../../../platform2/common-mk/common_test.gypi'],
           'sources': [
             'background_command_transceiver_test.cc',
             'hmac_authorization_delegate_unittest.cc',