summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2016-03-04 10:56:44 -0800
committerDan Albert <danalbert@google.com>2016-03-04 10:57:31 -0800
commite534eac44919a85de1660115e29e18f5548b6869 (patch)
treed6f67722c8dcd3f2c23cb41478ff703b330d01d0
parent4df4f820cab2220211575b58a772c0db4de0b039 (diff)
downloadtpm-e534eac44919a85de1660115e29e18f5548b6869.tar.gz
Revert "Stop hardcoding the gtest path."android-n-preview-1
This module uses gtest_prod.h, so does actually need to know about these headers. This reverts commit 78806e4c7fec6a9d5b0d399d2851dae5e584e084. Bug: http://b/16574165 Change-Id: Ic610c4f4e1e38992c9190087ae3d9829e13d8f4f
-rw-r--r--trunks/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/trunks/Android.mk b/trunks/Android.mk
index 142a77e..5c48ca7 100644
--- a/trunks/Android.mk
+++ b/trunks/Android.mk
@@ -18,7 +18,7 @@ LOCAL_PATH := $(call my-dir)
# ========================================================
trunksCppExtension := .cc
trunksCFlags := -Wall -Werror -Wno-unused-parameter -DUSE_BINDER_IPC
-trunksIncludes := $(LOCAL_PATH)/..
+trunksIncludes := $(LOCAL_PATH)/.. external/gtest/include
trunksSharedLibraries := \
libbinder \
libbinderwrapper \