From cad86b899faa8bf925646522d8bb348095199cdf Mon Sep 17 00:00:00 2001 From: Alex Deymo Date: Mon, 25 Jul 2016 16:04:23 -0700 Subject: Build static version of libbrillo-stream. This patch includes the static library version of libbrillo-stream and fixes the missing static library dependencies in libbrillo. Bug: 27178350 TEST=Built a static update_engine_sideload. Change-Id: I1fd5ea66845e13ffef33dd02adf5edd060b3f68e --- Android.mk | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index 5dbfc64..305d372 100644 --- a/Android.mk +++ b/Android.mk @@ -281,8 +281,24 @@ LOCAL_CPP_EXTENSION := $(libbrillo_cpp_extension) 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 libgtest_prod +LOCAL_STATIC_LIBRARIES := $(libbrillo_shared_libraries) libmodpb64 libgtest_prod +LOCAL_EXPORT_STATIC_LIBRARY_HEADERS := $(LOCAL_STATIC_LIBRARIES) +LOCAL_CFLAGS := $(libbrillo_CFLAGS) +LOCAL_CPPFLAGS := $(libbrillo_CPPFLAGS) +LOCAL_CLANG := true +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) +include $(BUILD_STATIC_LIBRARY) + +# Static stream library for target +# ======================================================== +include $(CLEAR_VARS) +LOCAL_CPP_EXTENSION := $(libbrillo_cpp_extension) +LOCAL_MODULE := libbrillo-stream +LOCAL_SRC_FILES := $(libbrillo_stream_sources) +LOCAL_C_INCLUDES := $(libbrillo_includes) +LOCAL_STATIC_LIBRARIES := $(libbrillo_shared_libraries) libbrillo \ + libcrypto libssl libgtest_prod +LOCAL_EXPORT_STATIC_LIBRARY_HEADERS := $(LOCAL_STATIC_LIBRARIES) LOCAL_CFLAGS := $(libbrillo_CFLAGS) LOCAL_CPPFLAGS := $(libbrillo_CPPFLAGS) LOCAL_CLANG := true -- cgit v1.2.3