diff options
| author | Utkarsh Sanghi <usanghi@google.com> | 2015-09-14 08:21:28 -0700 |
|---|---|---|
| committer | Utkarsh Sanghi <usanghi@google.com> | 2015-09-14 08:41:16 -0700 |
| commit | c2460743423995ce27c5d8ede4c63653cdcc1a7b (patch) | |
| tree | 1c5efc617cc9f8f10cb6c3bb91f4ff27337324df | |
| parent | 259fa1be39c0a35ec374fe127ba49d1c5ed5eb18 (diff) | |
| download | tpm_manager-c2460743423995ce27c5d8ede4c63653cdcc1a7b.tar.gz | |
tpm_manager: Build from AOSP
This CL allows for tpm_manager to compile from its new source code
location.
This CL also modifies the MODULE_LICENSE to apache2.
Bug: 23900830
TEST=emerge-link tpm_manager
Change-Id: I2c62aab9c93f909b8b9ba8ee78c307f34b40e9b9
| -rw-r--r-- | MODULE_LICENSE_APACHE2 (renamed from MODULE_LICENSE_BSD) | 0 | ||||
| -rw-r--r-- | tpm_manager.gyp | 11 |
2 files changed, 8 insertions, 3 deletions
diff --git a/MODULE_LICENSE_BSD b/MODULE_LICENSE_APACHE2 index e69de29..e69de29 100644 --- a/MODULE_LICENSE_BSD +++ b/MODULE_LICENSE_APACHE2 diff --git a/tpm_manager.gyp b/tpm_manager.gyp index af8bff5..aabcbab 100644 --- a/tpm_manager.gyp +++ b/tpm_manager.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 + # "tpm_manager/...". + '<(platform2_root)/../aosp/system/', + ], 'defines': [ 'USE_TPM2=<(USE_tpm2)' ], }, 'targets': [ @@ -42,7 +47,7 @@ 'common/print_dbus_interface_proto.cc', 'common/print_local_data_proto.cc', ], - 'includes': ['../common-mk/protoc.gypi'], + 'includes': ['../../../platform2/common-mk/protoc.gypi'], }, # A shared library for clients. { @@ -130,7 +135,7 @@ { 'target_name': 'tpm_manager_testrunner', 'type': 'executable', - 'includes': ['../common-mk/common_test.gypi'], + 'includes': ['../../../platform2/common-mk/common_test.gypi'], 'variables': { 'deps': [ 'libchrome-test-<(libbase_ver)', |