Merge "Use dependency files generated by llvm-rs-cc for Java"
diff --git a/core/clang/config.mk b/core/clang/config.mk
index 6df3e17..c184a87 100644
--- a/core/clang/config.mk
+++ b/core/clang/config.mk
@@ -60,8 +60,10 @@
# Force clang to always output color diagnostics. Ninja will strip the ANSI
# color codes if it is not running in a terminal.
+ifdef BUILDING_WITH_NINJA
CLANG_CONFIG_EXTRA_CFLAGS += \
-fcolor-diagnostics
+endif
CLANG_CONFIG_UNKNOWN_CFLAGS := \
-finline-functions \
diff --git a/core/config.mk b/core/config.mk
index 34be76b..0f19dea 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -587,7 +587,9 @@
# Force gcc to always output color diagnostics. Ninja will strip the ANSI
# color codes if it is not running in a terminal.
+ifdef BUILDING_WITH_NINJA
COMMON_GLOBAL_CFLAGS += -fdiagnostics-color
+endif
COMMON_GLOBAL_CPPFLAGS:= -Wsign-promo
COMMON_RELEASE_CPPFLAGS:=
diff --git a/tools/releasetools/target_files_diff.py b/tools/releasetools/target_files_diff.py
index 405c42b..acb7448 100755
--- a/tools/releasetools/target_files_diff.py
+++ b/tools/releasetools/target_files_diff.py
@@ -51,9 +51,6 @@
'RECOVERY/RAMDISK/selinux_version']:
return True
- # b/24201956 .art/.oat/.odex files are different with every build
- if name.endswith('.art') or name.endswith('.oat') or name.endswith('.odex'):
- return True
# b/25348136 libpac.so changes with every build
if name in ['SYSTEM/lib/libpac.so',
'SYSTEM/lib64/libpac.so']:
@@ -76,6 +73,7 @@
'ro.build.date=',
'ro.build.date.utc=',
'ro.build.host=',
+ 'ro.build.user=',
'ro.build.description=',
'ro.build.fingerprint=',
'ro.expect.recovery_id=',