Merge "Set LOCAL_CERTIFICATE for flattened apex APKs" (f9192060) · Commits · e / os / android_build_soong

apex/androidmk.go

+1 −0

Original line number	Diff line number	Diff line
		@@ -163,6 +163,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexName, moduleDir string)
		fmt.Fprintln(w, "LOCAL_DEX_PREOPT := false")
		fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_java_prebuilt.mk")
		} else if fi.class == app {
		fmt.Fprintln(w, "LOCAL_CERTIFICATE :=", fi.certificate.AndroidMkString())
		// soong_app_prebuilt.mk sets LOCAL_MODULE_SUFFIX := .apk Therefore
		// we need to remove the suffix from LOCAL_MODULE_STEM, otherwise
		// we will have foo.apk.apk

apex/apex.go

+4 −1

Original line number	Diff line number	Diff line
		@@ -710,6 +710,7 @@ type apexFile struct {
		hostRequiredModuleNames []string

		jacocoReportClassesFile android.Path // only for javalibs and apps
		certificate java.Certificate // only for apps
		}

		func newApexFile(ctx android.BaseModuleContext, builtFile android.Path, moduleName string, installDir string, class apexFileClass, module android.Module) apexFile {
		@@ -1198,6 +1199,7 @@ func apexFileForAndroidApp(ctx android.BaseModuleContext, aapp interface {
		Privileged() bool
		OutputFile() android.Path
		JacocoReportClassesFile() android.Path
		Certificate() java.Certificate
		}, pkgName string) apexFile {
		appDir := "app"
		if aapp.Privileged() {
		@@ -1207,6 +1209,7 @@ func apexFileForAndroidApp(ctx android.BaseModuleContext, aapp interface {
		fileToCopy := aapp.OutputFile()
		af := newApexFile(ctx, fileToCopy, aapp.Name(), dirInApex, app, aapp)
		af.jacocoReportClassesFile = aapp.JacocoReportClassesFile()
		af.certificate = aapp.Certificate()
		return af
		}

java/androidmk.go

+1 −5

Original line number	Diff line number	Diff line
		@@ -663,11 +663,7 @@ func (a *AndroidAppImport) AndroidMkEntries() []android.AndroidMkEntries {
		ExtraEntries: []android.AndroidMkExtraEntriesFunc{
		func(entries *android.AndroidMkEntries) {
		entries.SetBoolIfTrue("LOCAL_PRIVILEGED_MODULE", a.Privileged())
		if a.certificate != nil {
		entries.SetPath("LOCAL_CERTIFICATE", a.certificate.Pem)
		} else {
		entries.SetString("LOCAL_CERTIFICATE", "PRESIGNED")
		}
		entries.SetString("LOCAL_CERTIFICATE", a.certificate.AndroidMkString())
		entries.AddStrings("LOCAL_OVERRIDES_PACKAGES", a.properties.Overrides...)
		if len(a.dexpreopter.builtInstalled) > 0 {
		entries.SetString("LOCAL_SOONG_BUILT_INSTALLED", a.dexpreopter.builtInstalled)

java/app.go

+31 −8

Original line number	Diff line number	Diff line
		@@ -154,10 +154,25 @@ func (a *AndroidApp) OutputFile() android.Path {
		return a.outputFile
		}

		func (a *AndroidApp) Certificate() Certificate {
		return a.certificate
		}

		var _ AndroidLibraryDependency = (*AndroidApp)(nil)

		type Certificate struct {
		Pem, Key android.Path
		presigned bool
		}

		var presignedCertificate = Certificate{presigned: true}

		func (c Certificate) AndroidMkString() string {
		if c.presigned {
		return "PRESIGNED"
		} else {
		return c.Pem.String()
		}
		}

		func (a *AndroidApp) DepsMutator(ctx android.BottomUpMutatorContext) {
		@@ -405,12 +420,15 @@ func processMainCert(m android.ModuleBase, certPropValue string, certificates []
		if certPropValue != "" {
		defaultDir := ctx.Config().DefaultAppCertificateDir(ctx)
		mainCert = Certificate{
		defaultDir.Join(ctx, certPropValue+".x509.pem"),
		defaultDir.Join(ctx, certPropValue+".pk8"),
		Pem: defaultDir.Join(ctx, certPropValue+".x509.pem"),
		Key: defaultDir.Join(ctx, certPropValue+".pk8"),
		}
		} else {
		pem, key := ctx.Config().DefaultAppCertificate(ctx)
		mainCert = Certificate{pem, key}
		mainCert = Certificate{
		Pem: pem,
		Key: key,
		}
		}
		certificates = append([]Certificate{mainCert}, certificates...)
		}
		@@ -798,8 +816,8 @@ func AndroidAppCertificateFactory() android.Module {
		func (c *AndroidAppCertificate) GenerateAndroidBuildActions(ctx android.ModuleContext) {
		cert := String(c.properties.Certificate)
		c.Certificate = Certificate{
		android.PathForModuleSrc(ctx, cert+".x509.pem"),
		android.PathForModuleSrc(ctx, cert+".pk8"),
		Pem: android.PathForModuleSrc(ctx, cert+".x509.pem"),
		Key: android.PathForModuleSrc(ctx, cert+".pk8"),
		}
		}

		@@ -856,7 +874,7 @@ type AndroidAppImport struct {
		archVariants interface{}

		outputFile android.Path
		certificate *Certificate
		certificate Certificate

		dexpreopter

		@@ -1064,7 +1082,7 @@ func (a *AndroidAppImport) generateAndroidBuildActions(ctx android.ModuleContext
		if len(certificates) != 1 {
		ctx.ModuleErrorf("Unexpected number of certificates were extracted: %q", certificates)
		}
		a.certificate = &certificates[0]
		a.certificate = certificates[0]
		signed := android.PathForModuleOut(ctx, "signed", ctx.ModuleName()+".apk")
		SignAppPackage(ctx, signed, dexOutput, certificates)
		a.outputFile = signed
		@@ -1072,6 +1090,7 @@ func (a *AndroidAppImport) generateAndroidBuildActions(ctx android.ModuleContext
		alignedApk := android.PathForModuleOut(ctx, "zip-aligned", ctx.ModuleName()+".apk")
		TransformZipAlign(ctx, alignedApk, dexOutput)
		a.outputFile = alignedApk
		a.certificate = presignedCertificate
		}

		// TODO: Optionally compress the output apk.
		@@ -1098,6 +1117,10 @@ func (a *AndroidAppImport) JacocoReportClassesFile() android.Path {
		return nil
		}

		func (a *AndroidAppImport) Certificate() Certificate {
		return a.certificate
		}

		var dpiVariantGroupType reflect.Type
		var archVariantGroupType reflect.Type