Merge changes Ife723733,I68acfb53,Id216c35d,Id0569831,Iadac88f8, ...
* changes: Add system/media/audio/include to commonGlobalIncludes Add -Werror=date-time to target builds DeviceUsesClang should default to true clang now supports -fdebug-prefix-map=. Turn on ninja errors for duplicate rules Update to use the latest clang-2629532
This commit is contained in:
commit
4fef64b320
4
cc/cc.go
4
cc/cc.go
|
@ -94,6 +94,7 @@ var (
|
|||
"-Werror=non-virtual-dtor",
|
||||
"-Werror=address",
|
||||
"-Werror=sequence-point",
|
||||
"-Werror=date-time",
|
||||
}
|
||||
|
||||
hostGlobalCflags = []string{}
|
||||
|
@ -128,6 +129,7 @@ func init() {
|
|||
pctx.PrefixedPathsForOptionalSourceVariable("commonGlobalIncludes", "-isystem ",
|
||||
[]string{
|
||||
"system/core/include",
|
||||
"system/media/audio/include",
|
||||
"hardware/libhardware/include",
|
||||
"hardware/libhardware_legacy/include",
|
||||
"hardware/ril/include",
|
||||
|
@ -142,7 +144,7 @@ func init() {
|
|||
pctx.PrefixedPathsForOptionalSourceVariable("commonNativehelperInclude", "-I",
|
||||
[]string{"libnativehelper/include/nativehelper"})
|
||||
|
||||
pctx.SourcePathVariable("clangPath", "prebuilts/clang/host/${HostPrebuiltTag}/3.8/bin")
|
||||
pctx.SourcePathVariable("clangPath", "prebuilts/clang/host/${HostPrebuiltTag}/clang-2629532/bin")
|
||||
}
|
||||
|
||||
type CCModuleContext common.AndroidBaseContext
|
||||
|
|
|
@ -31,7 +31,6 @@ var clangUnknownCflags = sorted([]string{
|
|||
"-Wunused-but-set-parameter",
|
||||
"-Wunused-but-set-variable",
|
||||
"-fdiagnostics-color",
|
||||
"-fdebug-prefix-map=/proc/self/cwd=",
|
||||
|
||||
// arm + arm64 + mips + mips64
|
||||
"-fgcse-after-reload",
|
||||
|
|
|
@ -261,7 +261,7 @@ func (c *config) DeviceUsesClang() bool {
|
|||
if c.ProductVariables.DeviceUsesClang != nil {
|
||||
return *c.ProductVariables.DeviceUsesClang
|
||||
}
|
||||
return false
|
||||
return true
|
||||
}
|
||||
|
||||
func (c *config) ResourceOverlays() []SourcePath {
|
||||
|
|
|
@ -40,4 +40,4 @@ if [ -f "${ENVFILE}" ]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
"prebuilts/ninja/${PREBUILTOS}/ninja" -f "${BUILDDIR}/build.ninja" "$@"
|
||||
"prebuilts/ninja/${PREBUILTOS}/ninja" -f "${BUILDDIR}/build.ninja" -w dupbuild=err "$@"
|
||||
|
|
Loading…
Reference in New Issue