diff options
| author | Dan Albert <danalbert@google.com> | 2016-03-04 13:25:01 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2016-05-06 15:27:00 -0700 |
| commit | d68cece5b0f94a3445869a025f0a331a60046b90 (patch) | |
| tree | 1ece5f24c8e98717007199fd179bc23550628d1f | |
| parent | dbcda1a2f60b5f1be10dff53c31ee72d6940e185 (diff) | |
| download | tpm-d68cece5b0f94a3445869a025f0a331a60046b90.tar.gz | |
Use libgtest_prod.android-wear-n-preview-3android-wear-n-preview-1android-n-preview-3
Bug: http://b/16574165
Change-Id: Ieddcc0d43982806df13f4a10ebe94f521b60be36
| -rw-r--r-- | trunks/Android.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/trunks/Android.mk b/trunks/Android.mk index 5c48ca7..86bf8ab 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)/.. external/gtest/include +trunksIncludes := $(LOCAL_PATH)/.. trunksSharedLibraries := \ libbinder \ libbinderwrapper \ @@ -60,7 +60,7 @@ LOCAL_CFLAGS := $(trunksCFlags) LOCAL_CLANG := true LOCAL_C_INCLUDES := $(trunksIncludes) LOCAL_SHARED_LIBRARIES := $(trunksSharedLibraries) -LOCAL_STATIC_LIBRARIES := libtrunks_generated +LOCAL_STATIC_LIBRARIES := libtrunks_generated libgtest_prod LOCAL_SRC_FILES := \ background_command_transceiver.cc \ blob_parser.cc \ @@ -103,6 +103,7 @@ ifeq ($(BRILLOEMULATOR),true) LOCAL_SHARED_LIBRARIES += libtpm2 endif LOCAL_STATIC_LIBRARIES := \ + libgtest_prod \ libtrunks_generated \ libtrunks_common \ @@ -138,6 +139,7 @@ LOCAL_CLANG := true LOCAL_C_INCLUDES := $(trunksIncludes) LOCAL_SHARED_LIBRARIES := $(trunksSharedLibraries) LOCAL_STATIC_LIBRARIES := \ + libgtest_prod \ libtrunks_common \ libtrunks_generated \ @@ -155,7 +157,7 @@ LOCAL_CFLAGS := $(trunksCFlags) LOCAL_CLANG := true LOCAL_C_INCLUDES := $(trunksIncludes) LOCAL_SHARED_LIBRARIES := $(trunksSharedLibraries) libtrunks -LOCAL_STATIC_LIBRARIES := libtrunks_common +LOCAL_STATIC_LIBRARIES := libtrunks_common libgtest_prod LOCAL_SRC_FILES := \ trunks_client.cc \ trunks_client_test.cc \ @@ -198,7 +200,6 @@ LOCAL_SRC_FILES := \ LOCAL_STATIC_LIBRARIES := \ libgmock \ - libgtest \ libBionicGtestMain \ libtrunks_common \ libtrunks_generated \ |