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

Commit c3eb1b29 authored by Roland Levillain's avatar Roland Levillain Committed by Gerrit Code Review
Browse files

Merge "Fix some typos in Soong."

parents f9e10f94 8ac05575

apex/apex.go

+1 −1
Original line number Diff line number Diff line
@@ -1362,7 +1362,7 @@ func (a *apexBundle) buildManifest(ctx android.ModuleContext, provideNativeLibs, 
	})



	// b/143654022 Q apexd can't understand newly added keys in apex_manifest.json

	// prepare stripp-downed version so that APEX modules built from R+ can be installed to Q

	// prepare stripped-down version so that APEX modules built from R+ can be installed to Q

	a.manifestJsonOut = android.PathForModuleOut(ctx, "apex_manifest.json")

	ctx.Build(pctx, android.BuildParams{

		Rule:   stripApexManifestRule,

scripts/build-ndk-prebuilts.sh

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ source build/envsetup.sh 
PLATFORM_SDK_VERSION=$(get_build_var PLATFORM_SDK_VERSION)

PLATFORM_VERSION_ALL_CODENAMES=$(get_build_var PLATFORM_VERSION_ALL_CODENAMES)



# PLATFORM_VERSION_ALL_CODESNAMES is a comma separated list like O,P. We need to

# PLATFORM_VERSION_ALL_CODENAMES is a comma separated list like O,P. We need to

# turn this into ["O","P"].

PLATFORM_VERSION_ALL_CODENAMES=${PLATFORM_VERSION_ALL_CODENAMES/,/'","'}

PLATFORM_VERSION_ALL_CODENAMES="[\"${PLATFORM_VERSION_ALL_CODENAMES}\"]"