aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deymo <deymo@google.com>2016-08-03 00:55:15 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-08-03 00:55:15 +0000
commit40b34f9e27573fafda61f96637e2112b14cd57c2 (patch)
treed2ab1b1ab82f80cbbce259aa563bf38904a4a78a
parent6b98e33daea7a694fc3ffa60faec3531cd8ae804 (diff)
parent2d71d332dd19465215752713b8634593113b928c (diff)
downloadplatform_external_libbrillo-40b34f9e27573fafda61f96637e2112b14cd57c2.tar.gz
platform_external_libbrillo-40b34f9e27573fafda61f96637e2112b14cd57c2.tar.bz2
platform_external_libbrillo-40b34f9e27573fafda61f96637e2112b14cd57c2.zip
Build static version of libbrillo-stream. am: cad86b899f am: d7cea0625a am: e74ca9269d
am: 2d71d332dd Change-Id: I1c4ac4f898451d97394fcfa7bf5285dce53d56fd
-rw-r--r--Android.mk20
1 files 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