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. This cherry-pick updates the library names to match those in nyc. Bug: 27178350 TEST=Built a static update_engine_sideload. (cherry picked from commit cad86b899faa8bf925646522d8bb348095199cdf) Change-Id: Iaea03720ca7fa8079a5ee1cfe930b00746d385f1
diff --git a/Android.mk b/Android.mk index 59a9b9b..6eaa481 100644 --- a/Android.mk +++ b/Android.mk
@@ -274,8 +274,24 @@ 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 := $(libbrillo_shared_libraries) libmodpb64 +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_static libssl_static +LOCAL_EXPORT_STATIC_LIBRARY_HEADERS := $(LOCAL_STATIC_LIBRARIES) LOCAL_CFLAGS := $(libbrillo_CFLAGS) LOCAL_CPPFLAGS := $(libbrillo_CPPFLAGS) LOCAL_CLANG := true