Merge "Add default -Werror to hardware/qcom projects" am: c355edc09b am: 8fbfe37e9c
am: 0492a8aeff
Change-Id: I31f077acf2ff8eb0d739796479f7600fdb504539
diff --git a/android/variable.go b/android/variable.go
index 6962b0f..283a399 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -101,6 +101,11 @@
Uml struct {
Cppflags []string
}
+
+ Arc struct {
+ Exclude_srcs []string
+ Static_libs []string
+ }
} `android:"arch_variant"`
}
@@ -165,6 +170,7 @@
Enforce_vintf_manifest *bool `json:",omitempty"`
Pdk *bool `json:",omitempty"`
Uml *bool `json:",omitempty"`
+ Arc *bool `json:",omitempty"`
MinimizeJavaDebugInfo *bool `json:",omitempty"`
IntegerOverflowExcludePaths *[]string `json:",omitempty"`
diff --git a/cc/config/global.go b/cc/config/global.go
index ef710c8..f2d80b4 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -177,7 +177,7 @@
// This is used by non-NDK modules to get jni.h. export_include_dirs doesn't help
// with this, since there is no associated library.
pctx.PrefixedExistentPathsForSourcesVariable("CommonNativehelperInclude", "-I",
- []string{"libnativehelper/include_deprecated"})
+ []string{"libnativehelper/include_jni"})
pctx.SourcePathVariable("ClangDefaultBase", ClangDefaultBase)
pctx.VariableFunc("ClangBase", func(config android.Config) (string, error) {
diff --git a/cc/pgo.go b/cc/pgo.go
index fef962e..a7ff3c5 100644
--- a/cc/pgo.go
+++ b/cc/pgo.go
@@ -28,7 +28,7 @@
profileUseOtherFlags = []string{"-Wno-backend-plugin"}
)
-const pgoProfileProject = "toolchain/pgo-profiles"
+const pgoProfileProject = "vendor/google_data/pgo_profile"
const profileInstrumentFlag = "-fprofile-generate=/data/local/tmp"
const profileSamplingFlag = "-gline-tables-only"
diff --git a/java/config/config.go b/java/config/config.go
index 75176c9..e0c2c6e 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -39,6 +39,7 @@
"services",
"android.car",
"android.car7",
+ "core-oj",
}
)