Merge "Define clang lld flags for hosts." am: 94853de469
am: 473af9f5c7
Change-Id: Ie8ee2a49eeb55b4a2997055fed7d2602854cf425
diff --git a/android/api_levels.go b/android/api_levels.go
index a519117..b1b954c 100644
--- a/android/api_levels.go
+++ b/android/api_levels.go
@@ -65,6 +65,8 @@
"N": 24,
"N-MR1": 25,
"O": 26,
+ "O-MR1": 27,
+ "P": 28,
}
for i, codename := range ctx.Config().PlatformVersionCombinedCodenames() {
apiLevelsMap[codename] = baseApiLevel + i
diff --git a/android/variable.go b/android/variable.go
index 2057903..6ec8a50 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -96,6 +96,19 @@
Uml struct {
Cppflags []string
}
+
+ Use_lmkd_stats_log struct {
+ Cflags []string
+ }
+
+ Arc struct {
+ Cflags []string
+ Exclude_srcs []string
+ Include_dirs []string
+ Shared_libs []string
+ Static_libs []string
+ Srcs []string
+ }
} `android:"arch_variant"`
}
@@ -165,6 +178,8 @@
Enforce_vintf_manifest *bool `json:",omitempty"`
Pdk *bool `json:",omitempty"`
Uml *bool `json:",omitempty"`
+ Use_lmkd_stats_log *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 d998ca2..dabf3f2 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -187,7 +187,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(ctx android.PackageVarContext) string {
diff --git a/java/config/config.go b/java/config/config.go
index 3d7f910..5587a16 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -39,6 +39,8 @@
"services",
"android.car",
"android.car7",
+ "core-oj",
+ "core-libart",
}
)