Merge changes from topic "framework.aidl" into qt-dev (efcdd3b4) · Commits · e / os / android_build_soong

android/config.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -618,7 +618,7 @@ func (c *config) UnbundledBuild() bool {
		return Bool(c.productVariables.Unbundled_build)
		}

		func (c *config) UnbundledBuildPrebuiltSdks() bool {
		func (c *config) UnbundledBuildUsePrebuiltSdks() bool {
		return Bool(c.productVariables.Unbundled_build) && !Bool(c.productVariables.Unbundled_build_sdks_from_source)
		}

java/aar.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -511,7 +511,7 @@ func (a *AARImport) Name() string {
		}

		func (a *AARImport) DepsMutator(ctx android.BottomUpMutatorContext) {
		if !ctx.Config().UnbundledBuildPrebuiltSdks() {
		if !ctx.Config().UnbundledBuildUsePrebuiltSdks() {
		sdkDep := decodeSdkDep(ctx, sdkContext(a))
		if sdkDep.useModule && sdkDep.frameworkResModule != "" {
		ctx.AddVariationDependencies(nil, frameworkResTag, sdkDep.frameworkResModule)

java/android_manifest.go

+16 −4

Original line number	Diff line number	Diff line
		@@ -68,15 +68,27 @@ func manifestMerger(ctx android.ModuleContext, manifest android.Path, sdkContext
		args = append(args, "--use-embedded-dex=true")
		}

		var deps android.Paths
		targetSdkVersion := sdkVersionOrDefault(ctx, sdkContext.targetSdkVersion())
		if targetSdkVersion == ctx.Config().PlatformSdkCodename() &&
		ctx.Config().UnbundledBuild() &&
		!ctx.Config().UnbundledBuildUsePrebuiltSdks() &&
		ctx.Config().IsEnvTrue("UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT") {
		apiFingerprint := apiFingerprintPath(ctx)
		targetSdkVersion += fmt.Sprintf(".$$(cat %s)", apiFingerprint.String())
		deps = append(deps, apiFingerprint)
		}

		// Inject minSdkVersion into the manifest
		fixedManifest := android.PathForModuleOut(ctx, "manifest_fixer", "AndroidManifest.xml")
		ctx.Build(pctx, android.BuildParams{
		Rule: manifestFixerRule,
		Input: manifest,
		Implicits: deps,
		Output: fixedManifest,
		Args: map[string]string{
		"minSdkVersion": sdkVersionOrDefault(ctx, sdkContext.minSdkVersion()),
		"targetSdkVersion": sdkVersionOrDefault(ctx, sdkContext.targetSdkVersion()),
		"targetSdkVersion": targetSdkVersion,
		"args": strings.Join(args, " "),
		},
		})

java/builder.go

+1 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,7 @@ type javaBuilderFlags struct {
		processor string
		systemModules classpath
		aidlFlags string
		aidlDeps android.Paths
		javaVersion string

		errorProneExtraJavacFlags string

java/droiddoc.go

+8 −10

Original line number	Diff line number	Diff line
		@@ -404,6 +404,7 @@ type droiddocBuilderFlags struct {
		sourcepathArgs string
		dokkaClasspathArgs string
		aidlFlags string
		aidlDeps android.Paths

		doclavaStubsFlags string
		doclavaDocsFlags string
		@@ -574,26 +575,23 @@ func (j *Javadoc) genWhitelistPathPrefixes(whitelistPathPrefixes map[string]bool
		func (j *Javadoc) collectAidlFlags(ctx android.ModuleContext, deps deps) droiddocBuilderFlags {
		var flags droiddocBuilderFlags

		// aidl flags.
		aidlFlags := j.aidlFlags(ctx, deps.aidlPreprocess, deps.aidlIncludeDirs)
		if len(aidlFlags) > 0 {
		// optimization.
		ctx.Variable(pctx, "aidlFlags", strings.Join(aidlFlags, " "))
		flags.aidlFlags = "$aidlFlags"
		}
		flags.aidlFlags, flags.aidlDeps = j.aidlFlags(ctx, deps.aidlPreprocess, deps.aidlIncludeDirs)

		return flags
		}

		func (j *Javadoc) aidlFlags(ctx android.ModuleContext, aidlPreprocess android.OptionalPath,
		aidlIncludeDirs android.Paths) []string {
		aidlIncludeDirs android.Paths) (string, android.Paths) {

		aidlIncludes := android.PathsForModuleSrc(ctx, j.properties.Aidl.Local_include_dirs)
		aidlIncludes = append(aidlIncludes, android.PathsForSource(ctx, j.properties.Aidl.Include_dirs)...)

		var flags []string
		var deps android.Paths

		if aidlPreprocess.Valid() {
		flags = append(flags, "-p"+aidlPreprocess.String())
		deps = append(deps, aidlPreprocess.Path())
		} else {
		flags = append(flags, android.JoinWithPrefix(aidlIncludeDirs.Strings(), "-I"))
		}
		@@ -604,7 +602,7 @@ func (j *Javadoc) aidlFlags(ctx android.ModuleContext, aidlPreprocess android.Op
		flags = append(flags, "-I"+src.String())
		}

		return flags
		return strings.Join(flags, " "), deps
		}

		func (j *Javadoc) genSources(ctx android.ModuleContext, srcFiles android.Paths,
		@@ -615,7 +613,7 @@ func (j *Javadoc) genSources(ctx android.ModuleContext, srcFiles android.Paths,
		for _, srcFile := range srcFiles {
		switch srcFile.Ext() {
		case ".aidl":
		javaFile := genAidl(ctx, srcFile, flags.aidlFlags)
		javaFile := genAidl(ctx, srcFile, flags.aidlFlags, flags.aidlDeps)
		outSrcFiles = append(outSrcFiles, javaFile)
		case ".sysprop":
		javaFile := genSysprop(ctx, srcFile)