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

Commit a70425fb authored by Oriol Prieto Gascó's avatar Oriol Prieto Gascó
Browse files

Revert "Append APEX version instead of build ID for APK-in-APEX ..." 

Revert "Make apexer replace instances of version placeholder str..."

Revert submission 17944887-apk-in-apex

Reason for revert: Caused a regression (b/230873680)
Reverted Changes:
Ic37eeba8b:Make apexer replace instances of version placehold...
I9cef1418c:Append APEX version instead of build ID for APK-in...

Change-Id: I3da8bcb782baf71cddce9e4e92fe3894fc187b5c
parent 3b1dcf4f

apex/apex.go

+17 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package apex 
import (

	"fmt"

	"path/filepath"

	"regexp"

	"sort"

	"strings"
@@ -1656,7 +1657,20 @@ type androidApp interface { 
var _ androidApp = (*java.AndroidApp)(nil)

var _ androidApp = (*java.AndroidAppImport)(nil)



const APEX_VERSION_PLACEHOLDER = "__APEX_VERSION_PLACEHOLDER__"

func sanitizedBuildIdForPath(ctx android.BaseModuleContext) string {

	buildId := ctx.Config().BuildId()



	// The build ID is used as a suffix for a filename, so ensure that

	// the set of characters being used are sanitized.

	// - any word character: [a-zA-Z0-9_]

	// - dots: .

	// - dashes: -

	validRegex := regexp.MustCompile(`^[\w\.\-\_]+$`)

	if !validRegex.MatchString(buildId) {

		ctx.ModuleErrorf("Unable to use build id %s as filename suffix, valid characters are [a-z A-Z 0-9 _ . -].", buildId)

	}

	return buildId

}



func apexFileForAndroidApp(ctx android.BaseModuleContext, aapp androidApp) apexFile {

	appDir := "app"
@@ -1667,7 +1681,7 @@ func apexFileForAndroidApp(ctx android.BaseModuleContext, aapp androidApp) apexF 
	// TODO(b/224589412, b/226559955): Ensure that the subdirname is suffixed

	// so that PackageManager correctly invalidates the existing installed apk

	// in favour of the new APK-in-APEX.  See bugs for more information.

	dirInApex := filepath.Join(appDir, aapp.InstallApkName()+"@"+APEX_VERSION_PLACEHOLDER)

	dirInApex := filepath.Join(appDir, aapp.InstallApkName()+"@"+sanitizedBuildIdForPath(ctx))

	fileToCopy := aapp.OutputFile()



	af := newApexFile(ctx, fileToCopy, aapp.BaseModuleName(), dirInApex, app, aapp)
@@ -1906,7 +1920,7 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
					// suffixed so that PackageManager correctly invalidates the

					// existing installed apk in favour of the new APK-in-APEX.

					// See bugs for more information.

					appDirName := filepath.Join(appDir, ap.BaseModuleName()+"@"+APEX_VERSION_PLACEHOLDER)

					appDirName := filepath.Join(appDir, ap.BaseModuleName()+"@"+sanitizedBuildIdForPath(ctx))

					af := newApexFile(ctx, ap.OutputFile(), ap.BaseModuleName(), appDirName, appSet, ap)

					af.certificate = java.PresignedCertificate

					filesInfo = append(filesInfo, af)

apex/apex_test.go

+44 −13
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ var prepareForApexTest = android.GroupFixturePreparers( 
		// not because of these tests specifically (it's not used by the tests)

		variables.Platform_version_active_codenames = []string{"Q", "Tiramisu"}

		variables.Platform_vndk_version = proptools.StringPtr("29")

		variables.BuildId = proptools.StringPtr("TEST.BUILD_ID")

	}),

)
@@ -682,7 +683,7 @@ func TestDefaults(t *testing.T) { 
		"etc/myetc",

		"javalib/myjar.jar",

		"lib64/mylib.so",

		"app/AppFoo@__APEX_VERSION_PLACEHOLDER__/AppFoo.apk",

		"app/AppFoo@TEST.BUILD_ID/AppFoo.apk",

		"overlay/blue/rro.apk",

		"etc/bpf/bpf.o",

		"etc/bpf/bpf2.o",
@@ -5682,8 +5683,8 @@ func TestApexWithApps(t *testing.T) { 
	apexRule := module.Rule("apexRule")

	copyCmds := apexRule.Args["copy_commands"]



	ensureContains(t, copyCmds, "image.apex/app/AppFoo@__APEX_VERSION_PLACEHOLDER__/AppFoo.apk")

	ensureContains(t, copyCmds, "image.apex/priv-app/AppFooPriv@__APEX_VERSION_PLACEHOLDER__/AppFooPriv.apk")

	ensureContains(t, copyCmds, "image.apex/app/AppFoo@TEST.BUILD_ID/AppFoo.apk")

	ensureContains(t, copyCmds, "image.apex/priv-app/AppFooPriv@TEST.BUILD_ID/AppFooPriv.apk")



	appZipRule := ctx.ModuleForTests("AppFoo", "android_common_apex10000").Description("zip jni libs")

	// JNI libraries are uncompressed
@@ -5700,6 +5701,36 @@ func TestApexWithApps(t *testing.T) { 
	}

}



func TestApexWithAppImportBuildId(t *testing.T) {

	invalidBuildIds := []string{"../", "a b", "a/b", "a/b/../c", "/a"}

	for _, id := range invalidBuildIds {

		message := fmt.Sprintf("Unable to use build id %s as filename suffix", id)

		fixture := android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) {

			variables.BuildId = proptools.StringPtr(id)

		})

		testApexError(t, message, `apex {

			name: "myapex",

			key: "myapex.key",

			apps: ["AppFooPrebuilt"],

			updatable: false,

		}



		apex_key {

			name: "myapex.key",

			public_key: "testkey.avbpubkey",

			private_key: "testkey.pem",

		}



		android_app_import {

			name: "AppFooPrebuilt",

			apk: "PrebuiltAppFoo.apk",

			presigned: true,

			apex_available: ["myapex"],

		}

	`, fixture)

	}

}



func TestApexWithAppImports(t *testing.T) {

	ctx := testApex(t, `

		apex {
@@ -5745,8 +5776,8 @@ func TestApexWithAppImports(t *testing.T) { 
	apexRule := module.Rule("apexRule")

	copyCmds := apexRule.Args["copy_commands"]



	ensureContains(t, copyCmds, "image.apex/app/AppFooPrebuilt@__APEX_VERSION_PLACEHOLDER__/AppFooPrebuilt.apk")

	ensureContains(t, copyCmds, "image.apex/priv-app/AppFooPrivPrebuilt@__APEX_VERSION_PLACEHOLDER__/AwesomePrebuiltAppFooPriv.apk")

	ensureContains(t, copyCmds, "image.apex/app/AppFooPrebuilt@TEST.BUILD_ID/AppFooPrebuilt.apk")

	ensureContains(t, copyCmds, "image.apex/priv-app/AppFooPrivPrebuilt@TEST.BUILD_ID/AwesomePrebuiltAppFooPriv.apk")

}



func TestApexWithAppImportsPrefer(t *testing.T) {
@@ -5787,7 +5818,7 @@ func TestApexWithAppImportsPrefer(t *testing.T) { 
	}))



	ensureExactContents(t, ctx, "myapex", "android_common_myapex_image", []string{

		"app/AppFoo@__APEX_VERSION_PLACEHOLDER__/AppFooPrebuilt.apk",

		"app/AppFoo@TEST.BUILD_ID/AppFooPrebuilt.apk",

	})

}
@@ -5820,7 +5851,7 @@ func TestApexWithTestHelperApp(t *testing.T) { 
	apexRule := module.Rule("apexRule")

	copyCmds := apexRule.Args["copy_commands"]



	ensureContains(t, copyCmds, "image.apex/app/TesterHelpAppFoo@__APEX_VERSION_PLACEHOLDER__/TesterHelpAppFoo.apk")

	ensureContains(t, copyCmds, "image.apex/app/TesterHelpAppFoo@TEST.BUILD_ID/TesterHelpAppFoo.apk")

}



func TestApexPropertiesShouldBeDefaultable(t *testing.T) {
@@ -6263,8 +6294,8 @@ func TestOverrideApex(t *testing.T) { 
	apexRule := module.Rule("apexRule")

	copyCmds := apexRule.Args["copy_commands"]



	ensureNotContains(t, copyCmds, "image.apex/app/app@__APEX_VERSION_PLACEHOLDER__/app.apk")

	ensureContains(t, copyCmds, "image.apex/app/override_app@__APEX_VERSION_PLACEHOLDER__/override_app.apk")

	ensureNotContains(t, copyCmds, "image.apex/app/app@TEST.BUILD_ID/app.apk")

	ensureContains(t, copyCmds, "image.apex/app/override_app@TEST.BUILD_ID/override_app.apk")



	ensureNotContains(t, copyCmds, "image.apex/etc/bpf/bpf.o")

	ensureContains(t, copyCmds, "image.apex/etc/bpf/override_bpf.o")
@@ -7168,7 +7199,7 @@ func TestAppBundle(t *testing.T) { 
	content := bundleConfigRule.Args["content"]



	ensureContains(t, content, `"compression":{"uncompressed_glob":["apex_payload.img","apex_manifest.*"]}`)

	ensureContains(t, content, `"apex_config":{"apex_embedded_apk_config":[{"package_name":"com.android.foo","path":"app/AppFoo@__APEX_VERSION_PLACEHOLDER__/AppFoo.apk"}]}`)

	ensureContains(t, content, `"apex_config":{"apex_embedded_apk_config":[{"package_name":"com.android.foo","path":"app/AppFoo@TEST.BUILD_ID/AppFoo.apk"}]}`)

}



func TestAppSetBundle(t *testing.T) {
@@ -7199,9 +7230,9 @@ func TestAppSetBundle(t *testing.T) { 
	if len(copyCmds) != 3 {

		t.Fatalf("Expected 3 commands, got %d in:\n%s", len(copyCmds), s)

	}

	ensureMatches(t, copyCmds[0], "^rm -rf .*/app/AppSet@__APEX_VERSION_PLACEHOLDER__$")

	ensureMatches(t, copyCmds[1], "^mkdir -p .*/app/AppSet@__APEX_VERSION_PLACEHOLDER__$")

	ensureMatches(t, copyCmds[2], "^unzip .*-d .*/app/AppSet@__APEX_VERSION_PLACEHOLDER__ .*/AppSet.zip$")

	ensureMatches(t, copyCmds[0], "^rm -rf .*/app/AppSet@TEST.BUILD_ID$")

	ensureMatches(t, copyCmds[1], "^mkdir -p .*/app/AppSet@TEST.BUILD_ID$")

	ensureMatches(t, copyCmds[2], "^unzip .*-d .*/app/AppSet@TEST.BUILD_ID .*/AppSet.zip$")

}



func TestAppSetBundlePrebuilt(t *testing.T) {

apex/builder.go

+15 −20
Original line number Diff line number Diff line
@@ -107,16 +107,14 @@ var ( 
			`--canned_fs_config ${canned_fs_config} ` +

			`--include_build_info ` +

			`--payload_type image ` +

			`--key ${key} ` +

			`--apex_version_placeholder ${apex_version_placeholder} ` +

			`${opt_flags} ${image_dir} ${out} `,

			`--key ${key} ${opt_flags} ${image_dir} ${out} `,

		CommandDeps: []string{"${apexer}", "${avbtool}", "${e2fsdroid}", "${merge_zips}",

			"${mke2fs}", "${resize2fs}", "${sefcontext_compile}", "${make_f2fs}", "${sload_f2fs}", "${make_erofs}",

			"${soong_zip}", "${zipalign}", "${aapt2}", "prebuilts/sdk/current/public/android.jar"},

		Rspfile:        "${out}.copy_commands",

		RspfileContent: "${copy_commands}",

		Description:    "APEX ${image_dir} => ${out}",

	}, "tool_path", "image_dir", "copy_commands", "file_contexts", "canned_fs_config", "key", "opt_flags", "manifest", "payload_fs_type", "apex_version_placeholder")

	}, "tool_path", "image_dir", "copy_commands", "file_contexts", "canned_fs_config", "key", "opt_flags", "manifest", "payload_fs_type")



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

		Command: `rm -rf ${image_dir} && mkdir -p ${image_dir} && ` +
@@ -124,13 +122,12 @@ var ( 
			`APEXER_TOOL_PATH=${tool_path} ` +

			`${apexer} --force --manifest ${manifest} ` +

			`--payload_type zip ` +

			`--apex_version_placeholder ${apex_version_placeholder} ` +

			`${image_dir} ${out} `,

		CommandDeps:    []string{"${apexer}", "${merge_zips}", "${soong_zip}", "${zipalign}", "${aapt2}"},

		Rspfile:        "${out}.copy_commands",

		RspfileContent: "${copy_commands}",

		Description:    "ZipAPEX ${image_dir} => ${out}",

	}, "tool_path", "image_dir", "copy_commands", "manifest", "apex_version_placeholder")

	}, "tool_path", "image_dir", "copy_commands", "manifest")



	apexProtoConvertRule = pctx.AndroidStaticRule("apexProtoConvertRule",

		blueprint.RuleParams{
@@ -669,7 +666,6 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { 
				"canned_fs_config": cannedFsConfig.String(),

				"key":              a.privateKeyFile.String(),

				"opt_flags":        strings.Join(optFlags, " "),

				"apex_version_placeholder": APEX_VERSION_PLACEHOLDER,

			},

		})
@@ -765,7 +761,6 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { 
				"image_dir":     imageDir.String(),

				"copy_commands": strings.Join(copyCommands, " && "),

				"manifest":      a.manifestPbOut.String(),

				"apex_version_placeholder": APEX_VERSION_PLACEHOLDER,

			},

		})

	}