Prebuilt sanitizer libraries should always come from linux-x86. am: 755fe07256 am: 11a27f61e3
am: af0d71c83b
Change-Id: I462fc0542755c59b542c921dee3194dc8b048045
diff --git a/android/variable.go b/android/variable.go
index 2c2a0cf..800b1a1 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -101,6 +101,15 @@
Uml struct {
Cppflags []string
}
+
+ Arc struct {
+ Cflags []string
+ Exclude_srcs []string
+ Include_dirs []string
+ Shared_libs []string
+ Static_libs []string
+ Srcs []string
+ }
} `android:"arch_variant"`
}
@@ -166,6 +175,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 3784824..0934efa 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/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",
}
)