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

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

apex manifest is always installed as apex_manifest.json 

This change fixes a bug that when built with TARGET_FLATTEN_APEX=true,
apex manifests are installed without being renamed to
apex_manifest.json.

Test: TARGET_FLATTEN_APEX=true
Test: /system/apex/*/apex_mnifest.json exist
Test: device boots to the UI
Change-Id: Ib8baeb475babbf4faf6cc073e266bb3038ac1b2d
parent 28d80792

apex/apex.go

+9 −1
Original line number Diff line number Diff line
@@ -850,7 +850,15 @@ func (a *apexBundle) buildFlattenedApex(ctx android.ModuleContext) { 
		// For flattened APEX, do nothing but make sure that apex_manifest.json file is also copied along

		// with other ordinary files.

		manifest := android.PathForModuleSrc(ctx, proptools.StringDefault(a.properties.Manifest, "apex_manifest.json"))

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



		// rename to apex_manifest.json

		copiedManifest := android.PathForModuleOut(ctx, "apex_manifest.json")

		ctx.Build(pctx, android.BuildParams{

			Rule:   android.Cp,

			Input:  manifest,

			Output: copiedManifest,

		})

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



		for _, fi := range a.filesInfo {

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