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

Commit 004fbef8 authored by Sahana Rao's avatar Sahana Rao
Browse files

Add option to override defaultManifestVersion 

Add an option to override defaultManifestVersion using environment
variable. The environment variable will be used to override the apex
version locally when developing a desert release feature in
mainline-prod branch. Overriding the apex version in mainline-prod
branch allows us to install apex built in mainline-prod branch to device
running code from git_master which has a higher apex version than
mainline-prod branch.

Bug: b/233608815
Bug: b/196860838
Test: presubmit
Test: go test -v ./build/soong/apex/
Change-Id: I8ac2aae2b6b29da7f09db6edb893e0a0f0691e51
Merged-In: I8ac2aae2b6b29da7f09db6edb893e0a0f0691e51
parent c21336e7

apex/apex_test.go

+35 −0
Original line number Diff line number Diff line
@@ -4097,6 +4097,41 @@ func TestApexName(t *testing.T) { 
	ensureNotContains(t, androidMk, "LOCAL_MODULE := mylib.com.android.myapex\n")

}



func TestOverrideApexManifestDefaultVersion(t *testing.T) {

	ctx := testApex(t, `

		apex {

			name: "myapex",

			key: "myapex.key",

			apex_name: "com.android.myapex",

			native_shared_libs: ["mylib"],

			updatable: false,

		}



		apex_key {

			name: "myapex.key",

			public_key: "testkey.avbpubkey",

			private_key: "testkey.pem",

		}



		cc_library {

			name: "mylib",

			srcs: ["mylib.cpp"],

			system_shared_libs: [],

			stl: "none",

			apex_available: [

				"//apex_available:platform",

				"myapex",

			],

		}

	`, android.FixtureMergeEnv(map[string]string{

		"OVERRIDE_APEX_MANIFEST_DEFAULT_VERSION": "1234",

	}))



	module := ctx.ModuleForTests("myapex", "android_common_com.android.myapex_image")

	apexManifestRule := module.Rule("apexManifestRule")

	ensureContains(t, apexManifestRule.Args["default_version"], "1234")

}



func TestNonTestApex(t *testing.T) {

	ctx := testApex(t, `

		apex {

apex/builder.go

+5 −1
Original line number Diff line number Diff line
@@ -236,6 +236,10 @@ func (a *apexBundle) buildManifest(ctx android.ModuleContext, provideNativeLibs, 
	}



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

	defaultVersion := defaultManifestVersion

	if override := ctx.Config().Getenv("OVERRIDE_APEX_MANIFEST_DEFAULT_VERSION"); override != "" {

		defaultVersion = override

	}

	ctx.Build(pctx, android.BuildParams{

		Rule:   apexManifestRule,

		Input:  src,
@@ -243,7 +247,7 @@ func (a *apexBundle) buildManifest(ctx android.ModuleContext, provideNativeLibs, 
		Args: map[string]string{

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

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

			"default_version":   defaultManifestVersion,

			"default_version":   defaultVersion,

			"opt":               strings.Join(optCommands, " "),

		},

	})