diff options
| author | Christopher Wiley <wiley@google.com> | 2016-01-05 17:48:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-05 17:48:23 +0000 |
| commit | 4706432405b8689025da9f7f1155ded4f4b44e76 (patch) | |
| tree | 191b5bcfdd8ed6148df1bfd64b053aeb89b1b34a | |
| parent | 010a6a388656e8494f9b03c2e33b9a7eeccdab83 (diff) | |
| parent | b22b2857a43c8acff39efc0749f21f9ff349fb32 (diff) | |
| download | libchrome-4706432405b8689025da9f7f1155ded4f4b44e76.tar.gz | |
Export gtest headers from libchrome
am: b22b2857a4
* commit 'b22b2857a43c8acff39efc0749f21f9ff349fb32':
Export gtest headers from libchrome
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index 03e114ecf8..e4a6c9db53 100644 --- a/Android.mk +++ b/Android.mk @@ -33,6 +33,8 @@ libchromeCommonCIncludes := \ external/valgrind/include \ external/valgrind \ +libchromeExportedCIncludes := $(LOCAL_PATH) $(TOP)/external/gtest/include + libchromeCommonSrc := \ base/allocator/type_profiler_control.cc \ base/at_exit.cc \ @@ -381,7 +383,7 @@ LOCAL_CLANG := $(libchromeUseClang) LOCAL_C_INCLUDES := $(libchromeCommonCIncludes) LOCAL_SHARED_LIBRARIES := libevent liblog libcutils LOCAL_STATIC_LIBRARIES := libmodpb64 -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(libchromeExportedCIncludes) include $(BUILD_SHARED_LIBRARY) # libchrome shared library for host @@ -392,7 +394,7 @@ LOCAL_CFLAGS := $(libchromeCommonCFlags) $(libchromeHostCFlags) LOCAL_CLANG := $(libchromeUseClang) LOCAL_CPP_EXTENSION := $(libchromeCommonCppExtension) LOCAL_C_INCLUDES := $(libchromeCommonCIncludes) -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(libchromeExportedCIncludes) LOCAL_SHARED_LIBRARIES := libevent-host LOCAL_STATIC_LIBRARIES := libmodpb64-host LOCAL_SRC_FILES := $(libchromeCommonSrc) $(libchromeHostSrc) @@ -431,7 +433,7 @@ LOCAL_SHARED_LIBRARIES := \ libprotobuf-cpp-lite \ LOCAL_STATIC_LIBRARIES := -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(libchromeExportedCIncludes) include $(BUILD_SHARED_LIBRARY) endif # BRILLO_USE_DBUS == 1 |