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

Commit b81b9903 authored by Jiyong Park's avatar Jiyong Park
Browse files

Documenting apex/builer.go 

Mostly documentation changes, but includes a few refactorings like
changing the variable names, reordering functions, reordering statements
in logical order, etc.

Bug: 173472337
Test: m
Change-Id: Iefdc8e463bcda60187b98e8c90661e220e8cdf40
parent 547471cf

apex/apex.go

+19 −3
Original line number Diff line number Diff line
@@ -1786,14 +1786,11 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
		a.linkToSystemLib = false

	}



	a.setCertificateAndPrivateKey(ctx)



	a.compatSymlinks = makeCompatSymlinks(a.BaseModuleName(), ctx)



	////////////////////////////////////////////////////////////////////////////////////////////

	// 4) generate the build rules to create the APEX. This is done in builder.go.

	a.buildManifest(ctx, provideNativeLibs, requireNativeLibs)

	a.buildFileContexts(ctx)

	if a.properties.ApexType == flattenedApex {

		a.buildFlattenedApex(ctx)

	} else {
@@ -1802,6 +1799,25 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
	a.buildApexDependencyInfo(ctx)

	a.buildLintReports(ctx)

	a.distFiles = a.GenerateTaggedDistFiles(ctx)



	// Append meta-files to the filesInfo list so that they are reflected in Android.mk as well.

	if a.installable() {

		// For flattened APEX, make sure that APEX manifest and apex_pubkey are also copied

		// along with other ordinary files. (Note that this is done by apexer for

		// non-flattened APEXes)

		a.filesInfo = append(a.filesInfo, newApexFile(ctx, a.manifestPbOut, "apex_manifest.pb", ".", etc, nil))



		// Place the public key as apex_pubkey. This is also done by apexer for

		// non-flattened APEXes case.

		// TODO(jiyong): Why do we need this CP rule?

		copiedPubkey := android.PathForModuleOut(ctx, "apex_pubkey")

		ctx.Build(pctx, android.BuildParams{

			Rule:   android.Cp,

			Input:  a.public_key_file,

			Output: copiedPubkey,

		})

		a.filesInfo = append(a.filesInfo, newApexFile(ctx, copiedPubkey, "apex_pubkey", ".", etc, nil))

	}

}



///////////////////////////////////////////////////////////////////////////////////////////////////

apex/builder.go

+162 −121

File changed.

Preview size limit exceeded, changes collapsed.

apex/key.go

+3 −2
Original line number Diff line number Diff line
@@ -127,13 +127,14 @@ func (s *apexKeysText) GenerateBuildActions(ctx android.SingletonContext) { 
	apexKeyMap := make(map[string]apexKeyEntry)

	ctx.VisitAllModules(func(module android.Module) {

		if m, ok := module.(*apexBundle); ok && m.Enabled() && m.installable() {

			pem, key := m.getCertificateAndPrivateKey(ctx)

			apexKeyMap[m.Name()] = apexKeyEntry{

				name:                  m.Name() + ".apex",

				presigned:             false,

				public_key:            m.public_key_file.String(),

				private_key:           m.private_key_file.String(),

				container_certificate: m.container_certificate_file.String(),

				container_private_key: m.container_private_key_file.String(),

				container_certificate: pem.String(),

				container_private_key: key.String(),

				partition:             m.PartitionTag(ctx.DeviceConfig()),

			}

		}