commit 8ce67ebdcba2d00de300a1fc4f40af1980ed47bf
author Alex Deymo <deymo@google.com> Fri Aug 12 18:07:02 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 12 18:07:02 2016 +0000
tree 6f6b34983ece99289341bb12e5cb51ae46102a09
parent 955cddc958a23ec0c09d9d4b79396744f83cd24e
parent 733e6febbc18cb308d20abb77a449bf1f954316f

Build static version of libbrillo-stream.
am: 733e6febbc

Change-Id: I8d39cee1b6c2a0b8514b2bc22e051c86f6d8c6f0

Android.mk

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