diff options
| author | Utkarsh Sanghi <usanghi@google.com> | 2015-09-14 08:22:47 -0700 |
|---|---|---|
| committer | Utkarsh Sanghi <usanghi@google.com> | 2015-09-14 08:42:40 -0700 |
| commit | 23672a810694f5532c2b57bfa1e92ea9fc3b5568 (patch) | |
| tree | ddc41473e2166f4657d0c901206a626f85d7f35b | |
| parent | 3daa5a0d71ba8facd8be9370df54c20c23be6d8d (diff) | |
| download | tpm-23672a810694f5532c2b57bfa1e92ea9fc3b5568.tar.gz | |
attestation: Build from AOSP
This CL allows for attestation to compile from its new source code
location.
This CL also modifies the MODULE_LICENSE to apache2
Bug: 23901903
TEST=emerge-link attestation
Change-Id: Ib665bc2566add4acdd8c261182fc66c32b109ace
| -rw-r--r-- | MODULE_LICENSE_APACHE2 (renamed from MODULE_LICENSE_BSD) | 0 | ||||
| -rw-r--r-- | attestation.gyp | 9 |
2 files changed, 7 insertions, 2 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/attestation.gyp b/attestation.gyp index e2620c6..617456a 100644 --- a/attestation.gyp +++ b/attestation.gyp @@ -23,6 +23,11 @@ 'protobuf-lite', ], }, + 'include_dirs': [ + # We need this include dir because we include all the local code as + # "attestation/...". + '<(platform2_root)/../aosp/system/', + ], }, 'targets': [ # A library for just the protobufs. @@ -47,7 +52,7 @@ 'common/print_common_proto.cc', 'common/print_interface_proto.cc', ], - 'includes': ['../common-mk/protoc.gypi'], + 'includes': ['../../../platform2/common-mk/protoc.gypi'], }, # A library for common code. { @@ -157,7 +162,7 @@ { 'target_name': 'attestation_testrunner', 'type': 'executable', - 'includes': ['../common-mk/common_test.gypi'], + 'includes': ['../../../platform2/common-mk/common_test.gypi'], 'variables': { 'deps': [ 'libchrome-test-<(libbase_ver)', |