Merge Android Pie into master (6bfe4eb4) · Commits · e / os / android_build_soong

android/api_levels.go

+2 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,8 @@ func getApiLevelsMap(config Config) map[string]int {
		"N": 24,
		"N-MR1": 25,
		"O": 26,
		"O-MR1": 27,
		"P": 28,
		}
		for i, codename := range config.PlatformVersionCombinedCodenames() {
		apiLevelsMap[codename] = baseApiLevel + i

+15 −0

Original line number	Diff line number	Diff line
		@@ -104,6 +104,19 @@ type variableProperties struct {
		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"`
		}

		@@ -174,6 +187,8 @@ type productVariables struct {
		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"`

+1 −6

Original line number	Diff line number	Diff line
		@@ -174,7 +174,6 @@ type toolchainArm64 struct {
		toolchain64Bit

		ldflags string
		lldflags string
		toolchainCflags string
		toolchainClangCflags string
		}
		@@ -232,7 +231,7 @@ func (t *toolchainArm64) ClangLdflags() string {
		}

		func (t *toolchainArm64) ClangLldflags() string {
		return t.lldflags
		return "${config.Arm64Lldflags}"
		}

		func (t *toolchainArm64) ToolchainClangCflags() string {
		@@ -270,10 +269,6 @@ func arm64ToolchainFactory(arch android.Arch) Toolchain {
		"${config.Arm64Ldflags}",
		extraLdflags,
		}, " "),
		lldflags: strings.Join([]string{
		"${config.Arm64Lldflags}",
		extraLdflags,
		}, " "),
		toolchainCflags: variantOrDefault(arm64CpuVariantCflagsVar, arch.CpuVariant),
		toolchainClangCflags: strings.Join(toolchainClangCflags, " "),
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -192,7 +192,7 @@ func init() {
		// 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 {

+8 −2

Original line number	Diff line number	Diff line
		@@ -236,8 +236,8 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
		}
		}

		// Enable CFI for all components in the include paths
		if s.Cfi == nil && ctx.Config().CFIEnabledForPath(ctx.ModuleDir()) {
		// Enable CFI for all components in the include paths (for Aarch64 only)
		if s.Cfi == nil && ctx.Config().CFIEnabledForPath(ctx.ModuleDir()) && ctx.Arch().ArchType == android.Arm64 {
		s.Cfi = boolPtr(true)
		if inList("cfi", ctx.Config().SanitizeDeviceDiag()) {
		s.Diag.Cfi = boolPtr(true)
		@@ -272,6 +272,12 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
		s.Integer_overflow = nil
		}

		// Also disable CFI for VNDK variants of components
		if ctx.isVndk() && ctx.useVndk() {
		s.Cfi = nil
		s.Diag.Cfi = nil
		}

		if ctx.staticBinary() {
		s.Address = nil
		s.Coverage = nil