commit cb8a15089695276e6fd29d3cfb93beaf0860db4f
author Treehugger Robot <treehugger-gerrit@google.com> Tue Oct 18 01:02:05 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 18 01:02:05 2016 +0000
tree 034f6b09b0bf333b7562b7a50408bfcf3c002354
parent 3372ce615aee7ed2b79ab3b05465f539a74ff614
parent d0aec89d43004718bc6e808a00c98303298eecfc

Merge "Split apart frameworks/compile into sub-projects."

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

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index c682d4e..aca32d7 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -58,7 +58,7 @@
 my_export_c_include_dirs := $(LOCAL_EXPORT_C_INCLUDE_DIRS)
 my_export_c_include_deps := $(LOCAL_EXPORT_C_INCLUDE_DEPS)
 
-ifneq (,$(foreach dir,$(COVERAGE_PATHS),$(filter $(dir)%,$(LOCAL_PATH))))
+ifneq (,$(strip $(foreach dir,$(COVERAGE_PATHS),$(filter $(dir)%,$(LOCAL_PATH)))))
   my_native_coverage := true
 else
   my_native_coverage := false