Merge changes I6f7d40b7,I25654032 am: 83a495830b am: dfcdeec8b2
am: 4335ca3cd6
Change-Id: I9a9e3adfb61a27fc387f90bf56571ec5dbdf512d
diff --git a/android/variable.go b/android/variable.go
index 41b32bd..e45cebd 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"`
}
@@ -170,6 +179,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 55ae9e3..f06d0bd 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 c5076eb..e985e69 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -39,6 +39,8 @@
"services",
"android.car",
"android.car7",
+ "core-oj",
+ "core-libart",
}
)