Merge "Reduce WarningAllowedProjects." am: c92168f08d am: 9741b57ad8
am: 3365041fae
Change-Id: Ia26ecbbcf1a68c1648fce9f416eb11b508e328b0
diff --git a/cc/config/global.go b/cc/config/global.go
index fb71e6a..c22396b 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -205,7 +205,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 ea23124..39d7dd5 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"