commit 3372ce615aee7ed2b79ab3b05465f539a74ff614
author Treehugger Robot <treehugger-gerrit@google.com> Tue Oct 18 00:43:09 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 18 00:43:10 2016 +0000
tree 2cfd5718cad83ac0d7733e40d635b1e2005de3c3
parent e5d1926c6147211971e1de018b7508f43264a1ae
parent 4a3be3db47ce3881060d99a188812996ef0c61e3

Merge "Fix bug preventing multi-module native coverage."

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 9232ce3..dc760b5 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2029,6 +2029,15 @@
 $(call dist-for-goals, target-files-package, $(BUILT_TARGET_FILES_PACKAGE))
 endif
 
+# -----------------------------------------------------------------
+# NDK Sysroot Package
+NDK_SYSROOT_TARGET := $(PRODUCT_OUT)/ndk_sysroot.tar.bz2
+$(NDK_SYSROOT_TARGET): ndk
+	@echo Package NDK sysroot...
+	$(hide) tar cjf $@ -C $(SOONG_OUT_DIR) ndk
+
+$(call dist-for-goals,sdk,$(NDK_SYSROOT_TARGET))
+
 ifeq ($(build_ota_package),true)
 # -----------------------------------------------------------------
 # OTA update package