Fix build in new aosp/system/tpm repo.

BUG=25820760
TEST=emerge on chromiumos, run unit tests

Change-Id: I63bc47ce0d05fdef25c31d2084012df6903b761f

4 files changed, 15 insertions, 14 deletions

diff --git a/attestation/attestation.gyp b/attestation/attestation.gyp
index 0f691f8..4147420 100644
--- a/attestation/attestation.gyp
+++ b/attestation/attestation.gyp
@@ -26,7 +26,7 @@
     'include_dirs': [
       # We need this include dir because we include all the local code as
       # "attestation/...".
-      '<(platform2_root)/../aosp/system/',
+      '<(platform2_root)/../aosp/system/tpm',
     ],
   },
   'targets': [
@@ -52,7 +52,7 @@
         'common/print_common_proto.cc',
         'common/print_interface_proto.cc',
       ],
-      'includes': ['../../../platform2/common-mk/protoc.gypi'],
+      'includes': ['../../../../platform2/common-mk/protoc.gypi'],
     },
     # A library for common code.
     {
@@ -162,7 +162,7 @@
         {
           'target_name': 'attestation_testrunner',
           'type': 'executable',
-          'includes': ['../../../platform2/common-mk/common_test.gypi'],
+          'includes': ['../../../../platform2/common-mk/common_test.gypi'],
           'variables': {
             'deps': [
               'libbrillo-test-<(libbase_ver)',
diff --git a/tpm_manager/tpm_manager.gyp b/tpm_manager/tpm_manager.gyp
index 4cea356..412ac10 100644
--- a/tpm_manager/tpm_manager.gyp
+++ b/tpm_manager/tpm_manager.gyp
@@ -16,7 +16,7 @@
 
 {
   'target_defaults': {
-    'includes': ['../../../platform2/common-mk/common.gypi'],
+    'includes': ['../../../../platform2/common-mk/common.gypi'],
     'variables': {
       'deps': [  # This is a list of pkg-config dependencies
         'libbrillo-<(libbase_ver)',
@@ -28,7 +28,7 @@
     'include_dirs': [
       # We need this include dir because we include all the local code as
       # "tpm_manager/...".
-      '<(platform2_root)/../aosp/system/',
+      '<(platform2_root)/../aosp/system/tpm/',
     ],
     'defines': [ 'USE_TPM2=<(USE_tpm2)' ],
   },
@@ -51,7 +51,7 @@
         'common/print_tpm_nvram_interface_proto.cc',
         'common/print_tpm_ownership_interface_proto.cc',
       ],
-      'includes': ['../../../platform2/common-mk/protoc.gypi'],
+      'includes': ['../../../../platform2/common-mk/protoc.gypi'],
     },
     # A shared library for clients.
     {
@@ -142,7 +142,7 @@
         {
           'target_name': 'tpm_manager_testrunner',
           'type': 'executable',
-          'includes': ['../../../platform2/common-mk/common_test.gypi'],
+          'includes': ['../../../../platform2/common-mk/common_test.gypi'],
           'variables': {
             'deps': [
               'libbrillo-test-<(libbase_ver)',
diff --git a/trunks/tpm_utility_test.cc b/trunks/tpm_utility_test.cc
index 344b37c..18436ba 100644
--- a/trunks/tpm_utility_test.cc
+++ b/trunks/tpm_utility_test.cc
@@ -1654,7 +1654,8 @@ TEST_F(TpmUtilityTest, DefineNVSpaceSuccess) {
   EXPECT_EQ(public_data.nv_public.nv_index, nvram_index);
   EXPECT_EQ(public_data.nv_public.name_alg, TPM_ALG_SHA256);
   EXPECT_EQ(public_data.nv_public.attributes,
-            TPMA_NV_OWNERWRITE | TPMA_NV_WRITEDEFINE | TPMA_NV_AUTHREAD);
+            TPMA_NV_NO_DA | TPMA_NV_OWNERWRITE | TPMA_NV_WRITEDEFINE |
+                TPMA_NV_AUTHREAD);
   EXPECT_EQ(public_data.nv_public.data_size, length);
 }
 
@@ -1715,7 +1716,7 @@ TEST_F(TpmUtilityTest, DestroyNVSpaceFailure) {
 TEST_F(TpmUtilityTest, LockNVSpaceSuccess) {
   uint32_t index = 53;
   uint32_t nvram_index = NV_INDEX_FIRST + index;
-  EXPECT_CALL(mock_tpm_, NV_WriteLockSync(nvram_index, _, nvram_index, _, _))
+  EXPECT_CALL(mock_tpm_, NV_WriteLockSync(TPM_RH_OWNER, _, nvram_index, _, _))
       .WillOnce(Return(TPM_RC_SUCCESS));
   EXPECT_EQ(TPM_RC_SUCCESS,
             utility_.LockNVSpace(index, &mock_authorization_delegate_));
@@ -1737,7 +1738,7 @@ TEST_F(TpmUtilityTest, LockNVSpaceBadSession) {
 TEST_F(TpmUtilityTest, LockNVSpaceFailure) {
   uint32_t index = 53;
   uint32_t nvram_index = NV_INDEX_FIRST + index;
-  EXPECT_CALL(mock_tpm_, NV_WriteLockSync(nvram_index, _, nvram_index, _, _))
+  EXPECT_CALL(mock_tpm_, NV_WriteLockSync(TPM_RH_OWNER, _, nvram_index, _, _))
       .WillOnce(Return(TPM_RC_FAILURE));
   EXPECT_EQ(TPM_RC_FAILURE,
             utility_.LockNVSpace(index, &mock_authorization_delegate_));
diff --git a/trunks/trunks.gyp b/trunks/trunks.gyp
index d9c709c..63c9907 100644
--- a/trunks/trunks.gyp
+++ b/trunks/trunks.gyp
@@ -16,7 +16,7 @@
 
 {
   'target_defaults': {
-    'includes': ['../../../platform2/common-mk/common.gypi'],
+    'includes': ['../../../../platform2/common-mk/common.gypi'],
     'variables': {
       'deps': [  # This is a list of pkg-config dependencies
         'libbrillo-<(libbase_ver)',
@@ -28,7 +28,7 @@
     'include_dirs': [
       # We need this include dir because we include all the local code as
       # "trunks/...".
-      '<(platform2_root)/../aosp/system/',
+      '<(platform2_root)/../aosp/system/tpm/',
     ],
   },
   'targets': [
@@ -42,7 +42,7 @@
       'sources': [
         '<(proto_in_dir)/dbus_interface.proto',
       ],
-      'includes': ['../../../platform2/common-mk/protoc.gypi'],
+      'includes': ['../../../../platform2/common-mk/protoc.gypi'],
     },
     {
       'target_name': 'trunks',
@@ -156,7 +156,7 @@
         {
           'target_name': 'trunks_testrunner',
           'type': 'executable',
-          'includes': ['../../../platform2/common-mk/common_test.gypi'],
+          'includes': ['../../../../platform2/common-mk/common_test.gypi'],
           'sources': [
             'background_command_transceiver_test.cc',
             'hmac_authorization_delegate_test.cc',