Merge "Export variable for device sanitize arch to Soong"
diff --git a/core/clang/tidy.mk b/core/clang/tidy.mk
index a081056..868f7bc 100644
--- a/core/clang/tidy.mk
+++ b/core/clang/tidy.mk
@@ -14,45 +14,6 @@
# limitations under the License.
#
-# Most Android source files are not clang-tidy clean yet.
-# Global tidy checks include only google*, performance*,
-# and misc-macro-parentheses, but not google-readability*
-# or google-runtime-references.
-DEFAULT_GLOBAL_TIDY_CHECKS ?= \
- $(subst $(space),, \
- -*,google* \
- ,misc-macro-parentheses \
- ,performance* \
- ,-google-readability* \
- ,-google-runtime-references \
- )
-
-# There are too many clang-tidy warnings in external and vendor projects.
-# Enable only some google checks for these projects.
-DEFAULT_EXTERNAL_VENDOR_TIDY_CHECKS ?= \
- $(subst $(space),, \
- -*,google* \
- ,-google-build-using-namespace \
- ,-google-default-arguments \
- ,-google-explicit-constructor \
- ,-google-readability* \
- ,-google-runtime-int \
- ,-google-runtime-references \
- )
-
-# Every word in DEFAULT_LOCAL_TIDY_CHECKS list has the following format:
-# <local_path_prefix>:,<tidy-checks>
-# The last matched local_path_prefix should be the most specific to be used.
-DEFAULT_LOCAL_TIDY_CHECKS := \
- external/:$(DEFAULT_EXTERNAL_VENDOR_TIDY_CHECKS) \
- external/google:$(DEFAULT_GLOBAL_TIDY_CHECKS) \
- external/webrtc:$(DEFAULT_GLOBAL_TIDY_CHECKS) \
- frameworks/compile/mclinker/:$(DEFAULT_EXTERNAL_VENDOR_TIDY_CHECKS) \
- hardware/qcom:$(DEFAULT_EXTERNAL_VENDOR_TIDY_CHECKS) \
- vendor/:$(DEFAULT_EXTERNAL_VENDOR_TIDY_CHECKS) \
- vendor/google:$(DEFAULT_GLOBAL_TIDY_CHECKS) \
- vendor/google_devices:$(DEFAULT_EXTERNAL_VENDOR_TIDY_CHECKS) \
-
# Returns 2nd word of $(1) if $(2) has prefix of the 1st word of $(1).
define find_default_local_tidy_check2
$(if $(filter $(word 1,$(1))%,$(2)/),$(word 2,$(1)))
@@ -75,25 +36,6 @@
)
endef
-# Give warnings to header files only in selected directories.
-# Do not give warnings to external or vendor header files,
-# which contain too many warnings.
-DEFAULT_TIDY_HEADER_DIRS := \
- $(subst $(space),, \
- art/ \
- |bionic/ \
- |bootable/ \
- |build/ \
- |cts/ \
- |dalvik/ \
- |developers/ \
- |development/ \
- |frameworks/ \
- |libcore/ \
- |libnativehelper/ \
- |system/ \
- )
-
# Default filter contains current directory $1 and DEFAULT_TIDY_HEADER_DIRS.
define default_tidy_header_filter
-header-filter="($(subst $(space),,$1|$(DEFAULT_TIDY_HEADER_DIRS)))"
diff --git a/core/ninja.mk b/core/ninja.mk
index 30146d2..b865a79 100644
--- a/core/ninja.mk
+++ b/core/ninja.mk
@@ -140,10 +140,11 @@
COMBINED_BUILD_NINJA := $(OUT_DIR)/combined$(KATI_NINJA_SUFFIX).ninja
-$(COMBINED_BUILD_NINJA): $(KATI_BUILD_NINJA)
+$(COMBINED_BUILD_NINJA): $(KATI_BUILD_NINJA) FORCE
$(hide) echo "builddir = $(OUT_DIR)" > $(COMBINED_BUILD_NINJA)
$(hide) echo "include $(KATI_BUILD_NINJA)" >> $(COMBINED_BUILD_NINJA)
$(hide) echo "include $(SOONG_BUILD_NINJA)" >> $(COMBINED_BUILD_NINJA)
+ $(hide) echo "build $(COMBINED_BUILD_NINJA): phony $(SOONG_BUILD_NINJA)" >> $(COMBINED_BUILD_NINJA)
$(sort $(DEFAULT_GOAL) $(ANDROID_GOALS)) : ninja_wrapper
@#empty