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

Commit 23c52b0e authored by Jiyong Park's avatar Jiyong Park
Browse files

:module syntax is supported for APEX even when TARGET_FLATTEN_APEX 

Build rules for both flattened and non-flattend APEXes are created
regardless of TARGET_FLATTEN_APEX. The selection is made in AndroidMk.
This allows other module to reference an APEX via :module syntax
irrespective of TARGET_FLATTEN_APEX.

Bug: 123780484
Test: TARGET_FLATTEN_APEX=true m out/soong/.intermediates/art/build/apex/art-check-debug-apex-gen/gen/art-check-debug-apex-gen.dummy
with aosp/891696 applied
Change-Id: Ia49415ec3d18cfc5081461be76900c73ea803dca
parent a55b12be

apex/apex.go

+21 −20
Original line number Diff line number Diff line
@@ -484,7 +484,6 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) { 
		{Mutator: "arch", Variation: "android_common"},

	}, javaLibTag, a.properties.Java_libs...)



	if !ctx.Config().FlattenApex() || ctx.Config().UnbundledBuild() {

	if String(a.properties.Key) == "" {

		ctx.ModuleErrorf("key is missing")

		return
@@ -496,7 +495,6 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) { 
		ctx.AddDependency(ctx.Module(), certificateTag, cert)

	}

}

}



func (a *apexBundle) Srcs() android.Paths {

	if file, ok := a.outputFiles[imageApex]; ok {
@@ -690,7 +688,7 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
	})



	a.flattened = ctx.Config().FlattenApex() && !ctx.Config().UnbundledBuild()

	if !a.flattened && keyFile == nil {

	if keyFile == nil {

		ctx.PropertyErrorf("key", "private_key for %q could not be found", String(a.properties.Key))

		return

	}
@@ -727,11 +725,12 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
		a.buildUnflattenedApex(ctx, keyFile, pubKeyFile, certificate, zipApex)

	}

	if a.apexTypes.image() {

		if ctx.Config().FlattenApex() {

			a.buildFlattenedApex(ctx)

		} else {

		// Build rule for unflattened APEX is created even when ctx.Config().FlattenApex()

		// is true. This is to support referencing APEX via ":<module_name" syntax

		// in other modules. It is in AndroidMk where the selection of flattened

		// or unflattened APEX is made.

		a.buildUnflattenedApex(ctx, keyFile, pubKeyFile, certificate, imageApex)

		}

		a.buildFlattenedApex(ctx)

	}

}
@@ -910,7 +909,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext, keyFile and 
	})



	// Install to $OUT/soong/{target,host}/.../apex

	if a.installable() {

	if a.installable() && !ctx.Config().FlattenApex() {

		ctx.InstallFile(android.PathForModuleInstall(ctx, "apex"), ctx.ModuleName()+suffix, a.outputFiles[apexType])

	}

}
@@ -930,12 +929,14 @@ func (a *apexBundle) buildFlattenedApex(ctx android.ModuleContext) { 
		})

		a.filesInfo = append(a.filesInfo, apexFile{copiedManifest, ctx.ModuleName() + ".apex_manifest.json", ".", etc, nil, nil})



		if ctx.Config().FlattenApex() {

			for _, fi := range a.filesInfo {

				dir := filepath.Join("apex", ctx.ModuleName(), fi.installDir)

				ctx.InstallFile(android.PathForModuleInstall(ctx, dir), fi.builtFile.Base(), fi.builtFile)

			}

		}

	}

}



func (a *apexBundle) AndroidMk() android.AndroidMkData {

	writers := []android.AndroidMkData{}

apex/key.go

+0 −5
Original line number Diff line number Diff line
@@ -63,11 +63,6 @@ func (m *apexKey) installable() bool { 
}



func (m *apexKey) GenerateAndroidBuildActions(ctx android.ModuleContext) {

	if ctx.Config().FlattenApex() && !ctx.Config().UnbundledBuild() {

		// Flattened APEXes are not signed

		return

	}



	m.public_key_file = ctx.Config().ApexKeyDir(ctx).Join(ctx, String(m.properties.Public_key))

	m.private_key_file = ctx.Config().ApexKeyDir(ctx).Join(ctx, String(m.properties.Private_key))