Merge "Add default -Werror to frameworks/ml/nn." am: a3818107e8 am: d0857b30f7
am: ea1d5420f6
Change-Id: Ida83b351cfd7b3eb7593919ab7bb1589f44677d9
diff --git a/android/variable.go b/android/variable.go
index ab8103a..27058ce 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -98,6 +98,11 @@
Uml struct {
Cppflags []string
}
+
+ Arc struct {
+ Exclude_srcs []string
+ Static_libs []string
+ }
} `android:"arch_variant"`
}
@@ -159,6 +164,7 @@
Treble *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 243a2f9..4d84d2b 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -189,7 +189,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 9fea154..bc672e5 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"