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

Commit 63eeda02 authored by Colin Cross's avatar Colin Cross
Browse files

Fix metalava api baseline update command 

metalava is run inside sbox with a modified $PWD, so putting $PWD in
the output message results in an incorrect path.  It was also always
incorrect when the output directory was an absolute path.  Add a
cd $ANDROID_BUILD_TOP to the command line and use relative paths
instead.

Bug: 185516277
Test: m out/soong/.intermediates/frameworks/base/system-api-stubs-docs-non-updatable/android_common/metalava/api_lint.timestamp with lint error
Change-Id: Iefe133cea4c3a604ecd2b0ea20f4ba14ae13b425
parent 4258a39b

java/droidstubs.go

+3 −6
Original line number Diff line number Diff line
@@ -516,9 +516,6 @@ func (d *Droidstubs) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
		d.apiLintTimestamp = android.PathForModuleOut(ctx, "metalava", "api_lint.timestamp")



		// Note this string includes a special shell quote $' ... ', which decodes the "\n"s.

		// However, because $' ... ' doesn't expand environmental variables, we can't just embed

		// $PWD, so we have to terminate $'...', use "$PWD", then start $' ... ' again,

		// which is why we have '"$PWD"$' in it.

		//

		// TODO: metalava also has a slightly different message hardcoded. Should we unify this

		// message and metalava's one?
@@ -539,9 +536,9 @@ func (d *Droidstubs) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
			msg += fmt.Sprintf(``+

				`2. You can update the baseline by executing the following\n`+

				`   command:\n`+

				`       cp \\\n`+

				`       "'"$PWD"$'/%s" \\\n`+

				`       "'"$PWD"$'/%s"\n`+

				`       (cd $ANDROID_BUILD_TOP && cp \\\n`+

				`       "%s" \\\n`+

				`       "%s")\n`+

				`   To submit the revised baseline.txt to the main Android\n`+

				`   repository, you will need approval.\n`, updatedBaselineOutput, baselineFile.Path())

		} else {