Merge changes from topics 'ndk-compiler-rt_extras', 'ndk-libc++-libdl'
* changes:
Use libcompiler-rt_extras with NDK builds.
Always link libdl with libc++ for the NDK.
diff --git a/core/config.mk b/core/config.mk
index 6178404..2d6ee17 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -40,21 +40,6 @@
$(error Please remove --color=always from your $$GREP_OPTIONS)
endif
-# Standard source directories.
-# TODO: Enforce some kind of layering; only add include paths
-# when a module links against a particular library.
-# TODO: See if we can remove most of these from the global list.
-SRC_SYSTEM_HEADERS := \
- $(wildcard system/core/include) \
- $(wildcard system/media/audio/include) \
- $(wildcard hardware/libhardware/include) \
- $(wildcard hardware/libhardware_legacy/include) \
- $(wildcard hardware/ril/include) \
- $(wildcard libnativehelper/include) \
- $(wildcard frameworks/native/include) \
- $(wildcard frameworks/native/opengl/include) \
- $(wildcard frameworks/av/include) \
- $(wildcard frameworks/base/include)
SRC_TARGET_DIR := $(TOPDIR)build/target
SRC_API_DIR := $(TOPDIR)prebuilts/sdk/api
SRC_SYSTEM_API_DIR := $(TOPDIR)prebuilts/sdk/system-api
diff --git a/core/envsetup.mk b/core/envsetup.mk
index 39a754b..8794c8a 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -469,7 +469,7 @@
TARGET_ROOT_OUT_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)
TARGET_ROOT_OUT_SBIN_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/sbin
TARGET_ROOT_OUT_BIN_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/bin
-TARGET_OUT_COVERAGE := $(PRODUCT_OUT)/coverages
+TARGET_OUT_COVERAGE := $(PRODUCT_OUT)/coverage
TARGET_ROOT_OUT := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_ROOT)
TARGET_ROOT_OUT_BIN := $(TARGET_ROOT_OUT)/bin
diff --git a/core/goma.mk b/core/goma.mk
index 52726be..4e8318a 100644
--- a/core/goma.mk
+++ b/core/goma.mk
@@ -49,7 +49,9 @@
# gomacc can start goma client's daemon process automatically, but
# it is safer and faster to start up it beforehand. We run this as a
# background process so this won't slow down the build.
- $(shell ( $(goma_ctl) ensure_start ) &> /dev/null &)
+ ifndef NOSTART_GOMA
+ $(shell ( $(goma_ctl) ensure_start ) &> /dev/null &)
+ endif
goma_ctl :=
goma_dir :=