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

Commit 612a0e28 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add option to override defaultManifestVersion" am: 720e0ce5 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2323675



Change-Id: I254fb1d934928aa069139eaf4377e84630d34bfa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e420ae7d 720e0ce5

apex/apex_test.go

+35 −0
Original line number Diff line number Diff line
@@ -4130,6 +4130,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 TestCompileMultilibProp(t *testing.T) {

	testCases := []struct {

		compileMultiLibProp string

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 := android.DefaultUpdatableModuleVersion

	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":   android.DefaultUpdatableModuleVersion,

			"default_version":   defaultVersion,

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

		},

	})