diff options
| author | Dan Albert <danalbert@google.com> | 2016-03-03 13:14:49 -0800 |
|---|---|---|
| committer | Treehugger Robot <treehugger-gerrit@google.com> | 2016-06-28 19:03:01 +0000 |
| commit | a623740c7ecf7d84cf6787c8fc9cb488ae198952 (patch) | |
| tree | 53d342cf941274d0f1dc313bd9c26f16e1eed98b | |
| parent | 711d51ceb2ed29be4328ada3bdb6fdd996dbe982 (diff) | |
| download | libbrillo-a623740c7ecf7d84cf6787c8fc9cb488ae198952.tar.gz | |
Use libgtest_prod.
Bug: http://b/16574165
Change-Id: I4f6a6587848b573bfe3bff6a3254deb09995b127
| -rw-r--r-- | Android.mk | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -153,7 +153,7 @@ libbrillo_CFLAGS := \ -Werror \ -DUSE_DBUS=$(local_use_dbus) libbrillo_CPPFLAGS := -libbrillo_includes := external/gtest/include +libbrillo_includes := libbrillo_shared_libraries := libchrome # Shared library for target @@ -164,7 +164,7 @@ LOCAL_MODULE := libbrillo LOCAL_SRC_FILES := $(libbrillo_core_sources) $(libbrillo_linux_sources) LOCAL_C_INCLUDES := $(libbrillo_includes) LOCAL_SHARED_LIBRARIES := $(libbrillo_shared_libraries) -LOCAL_STATIC_LIBRARIES := libmodpb64 +LOCAL_STATIC_LIBRARIES := libmodpb64 libgtest_prod LOCAL_CFLAGS := $(libbrillo_CFLAGS) LOCAL_CPPFLAGS := $(libbrillo_CPPFLAGS) LOCAL_CLANG := true @@ -183,6 +183,7 @@ LOCAL_SHARED_LIBRARIES := \ libbinder \ libbrillo \ libutils +LOCAL_STATIC_LIBRARIES := libgtest_prod LOCAL_CFLAGS := $(libbrillo_CFLAGS) LOCAL_CPPFLAGS := $(libbrillo_CPPFLAGS) LOCAL_CLANG := true @@ -200,6 +201,7 @@ LOCAL_SRC_FILES := $(libbrillo_dbus_sources) LOCAL_C_INCLUDES := $(libbrillo_includes) LOCAL_SHARED_LIBRARIES := $(libbrillo_shared_libraries) libbrillo \ libchrome-dbus libdbus +LOCAL_STATIC_LIBRARIES := libgtest_prod LOCAL_CFLAGS := $(libbrillo_CFLAGS) LOCAL_CPPFLAGS := $(libbrillo_CPPFLAGS) LOCAL_CLANG := true @@ -218,6 +220,7 @@ LOCAL_SRC_FILES := brillo/minijail/minijail.cc \ LOCAL_C_INCLUDES := $(libbrillo_includes) LOCAL_SHARED_LIBRARIES := $(libbrillo_shared_libraries) libbrillo \ libminijail +LOCAL_STATIC_LIBRARIES := libgtest_prod LOCAL_CFLAGS := $(libbrillo_CFLAGS) LOCAL_CPPFLAGS := $(libbrillo_CPPFLAGS) LOCAL_CLANG := true @@ -233,6 +236,7 @@ LOCAL_SRC_FILES := $(libbrillo_stream_sources) LOCAL_C_INCLUDES := $(libbrillo_includes) LOCAL_SHARED_LIBRARIES := $(libbrillo_shared_libraries) libbrillo \ libcrypto libssl +LOCAL_STATIC_LIBRARIES := libgtest_prod LOCAL_CFLAGS := $(libbrillo_CFLAGS) LOCAL_CPPFLAGS := $(libbrillo_CPPFLAGS) LOCAL_CLANG := true @@ -248,6 +252,7 @@ LOCAL_SRC_FILES := $(libbrillo_http_sources) LOCAL_C_INCLUDES := $(libbrillo_includes) LOCAL_SHARED_LIBRARIES := $(libbrillo_shared_libraries) libbrillo \ libbrillo-stream libcurl +LOCAL_STATIC_LIBRARIES := libgtest_prod LOCAL_CFLAGS := $(libbrillo_CFLAGS) LOCAL_CPPFLAGS := $(libbrillo_CPPFLAGS) LOCAL_CLANG := true @@ -262,6 +267,7 @@ LOCAL_MODULE := libbrillo-policy LOCAL_SRC_FILES := $(libbrillo_policy_sources) LOCAL_C_INCLUDES := $(libbrillo_includes) LOCAL_SHARED_LIBRARIES := $(libbrillo_shared_libraries) +LOCAL_STATIC_LIBRARIES := libgtest_prod LOCAL_CFLAGS := $(libbrillo_CFLAGS) LOCAL_CPPFLAGS := $(libbrillo_CPPFLAGS) LOCAL_CLANG := true @@ -276,7 +282,7 @@ LOCAL_MODULE := libbrillo LOCAL_SRC_FILES := $(libbrillo_core_sources) $(libbrillo_linux_sources) LOCAL_C_INCLUDES := $(libbrillo_includes) LOCAL_SHARED_LIBRARIES := $(libbrillo_shared_libraries) -LOCAL_STATIC_LIBRARIES := libmodpb64 +LOCAL_STATIC_LIBRARIES := libmodpb64 libgtest_prod LOCAL_CFLAGS := $(libbrillo_CFLAGS) LOCAL_CPPFLAGS := $(libbrillo_CPPFLAGS) LOCAL_CLANG := true @@ -307,7 +313,7 @@ LOCAL_MODULE := libbrillo LOCAL_SRC_FILES := $(libbrillo_core_sources) LOCAL_C_INCLUDES := $(libbrillo_includes) LOCAL_SHARED_LIBRARIES := $(libbrillo_shared_libraries) -LOCAL_STATIC_LIBRARIES := libmodpb64-host +LOCAL_STATIC_LIBRARIES := libmodpb64-host libgtest_prod LOCAL_CFLAGS := $(libbrillo_CFLAGS) LOCAL_CPPFLAGS := \ -D__ANDROID_HOST__ \ @@ -327,6 +333,7 @@ LOCAL_SRC_FILES := $(libbrillo_stream_sources) LOCAL_C_INCLUDES := $(libbrillo_includes) LOCAL_SHARED_LIBRARIES := $(libbrillo_shared_libraries) libbrillo \ libcrypto-host libssl-host +LOCAL_STATIC_LIBRARIES := libgtest_prod LOCAL_CFLAGS := $(libbrillo_CFLAGS) LOCAL_CPPFLAGS := $(libbrillo_CPPFLAGS) LOCAL_CLANG := true @@ -342,6 +349,7 @@ LOCAL_SRC_FILES := $(libbrillo_http_sources) LOCAL_C_INCLUDES := $(libbrillo_includes) LOCAL_SHARED_LIBRARIES := $(libbrillo_shared_libraries) libbrillo \ libbrillo-stream libcurl-host +LOCAL_STATIC_LIBRARIES := libgtest_prod LOCAL_CFLAGS := $(libbrillo_CFLAGS) LOCAL_CPPFLAGS := $(libbrillo_CPPFLAGS) LOCAL_CLANG := true |