Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee4b6336 authored by Alexei Nicoara's avatar Alexei Nicoara
Browse files

Removing comment lines from apex_manifest.json 

Allowing comments in apex_manifest.json by stripping all the lines which
start with //

Test: presubmit
Bug: 237532860
Change-Id: Iec8c9987edf19b763b2b87df7d125c006ffb217a
parent 9d46dcf9

apex/builder.go

+13 −1
Original line number Diff line number Diff line
@@ -82,6 +82,11 @@ var ( 
		Description: "prepare ${out}",

	}, "provideNativeLibs", "requireNativeLibs", "opt")



	stripCommentsApexManifestRule = pctx.StaticRule("stripCommentsApexManifestRule", blueprint.RuleParams{

		Command:     `sed '/^\s*\/\//d' $in > $out`,

		Description: "strip lines starting with // ${in}=>${out}",

	})



	stripApexManifestRule = pctx.StaticRule("stripApexManifestRule", blueprint.RuleParams{

		Command:     `rm -f $out && ${conv_apex_manifest} strip $in -o $out`,

		CommandDeps: []string{"${conv_apex_manifest}"},
@@ -205,10 +210,17 @@ func (a *apexBundle) buildManifest(ctx android.ModuleContext, provideNativeLibs, 
		optCommands = append(optCommands, "-a jniLibs "+strings.Join(jniLibs, " "))

	}



	manifestJsonCommentsStripped := android.PathForModuleOut(ctx, "apex_manifest_comments_stripped.json")

	ctx.Build(pctx, android.BuildParams{

		Rule:   stripCommentsApexManifestRule,

		Input:  src,

		Output: manifestJsonCommentsStripped,

	})



	manifestJsonFullOut := android.PathForModuleOut(ctx, "apex_manifest_full.json")

	ctx.Build(pctx, android.BuildParams{

		Rule:   apexManifestRule,

		Input:  src,

		Input:  manifestJsonCommentsStripped,

		Output: manifestJsonFullOut,

		Args: map[string]string{

			"provideNativeLibs": strings.Join(provideNativeLibs, " "),