From c7ca55e27bc2c3884267a0dd4616a5ed22c191c2 Mon Sep 17 00:00:00 2001
From: Paulo Casanova <pasc@google.com>
Date: Fri, 23 Sep 2016 20:52:31 +0100
Subject: [PATCH] Added building libaapt2_jni.so.

Change-Id: Ica2769c08b4bb5c6cceebb8052c0dd7817ef4586
---
 tools/aapt2/Android.mk | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/tools/aapt2/Android.mk b/tools/aapt2/Android.mk
index 9ec706fbf9bfd..60114fb6ff99b 100644
--- a/tools/aapt2/Android.mk
+++ b/tools/aapt2/Android.mk
@@ -77,6 +77,8 @@ sources := \
 
 sources += Format.proto
 
+sourcesJni :=
+
 testSources := \
 	compile/IdAssigner_test.cpp \
 	compile/InlineXmlFormatParser_test.cpp \
@@ -176,6 +178,25 @@ LOCAL_STATIC_LIBRARIES := $(hostStaticLibs)
 LOCAL_STATIC_LIBRARIES_windows := $(hostStaticLibs_windows)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
+
+# ==========================================================
+# Build the host shared library: libaapt2_jni
+# ==========================================================
+include $(CLEAR_VARS)
+LOCAL_MODULE := libaapt2_jni
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_HOST_OS := darwin linux windows
+LOCAL_CFLAGS := $(cFlags)
+LOCAL_CFLAGS_darwin := $(cFlags_darwin)
+LOCAL_CFLAGS_windows := $(cFlags_windows)
+LOCAL_CPPFLAGS := $(cppFlags)
+LOCAL_C_INCLUDES := $(protoIncludes)
+LOCAL_SRC_FILES := $(sourcesJni)
+LOCAL_STATIC_LIBRARIES := libaapt2 $(hostStaticLibs)
+LOCAL_STATIC_LIBRARIES_windows := $(hostStaticLibs_windows)
+include $(BUILD_HOST_SHARED_LIBRARY)
+
+
 # ==========================================================
 # Build the host tests: libaapt2_tests
 # ==========================================================