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

Commit 18bad5f5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topics "recovery_prebuilt_res", "target_screen_density" into main 

* changes:
  Specify dirs and symlinks for recovery partition
  Add recovery-resources-common-* module to FsGenState
  Remove neverallow restrictions for prebuilt_res module type
parents 4d72d3e3 9007f389

android/neverallow.go

+1 −1
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ func createInstallInRootAllowingRules() []Rule { 
			NotModuleType("prebuilt_sbin").

			NotModuleType("prebuilt_system").

			NotModuleType("prebuilt_first_stage_ramdisk").

			NotModuleType("prebuilt_res").

			Because("install_in_root is only for init_first_stage or librecovery_ui_ext."),

	}

}
@@ -344,7 +345,6 @@ func createPrebuiltEtcBpDefineRule() Rule { 
			"prebuilt_priv_app",

			"prebuilt_rfs",

			"prebuilt_framework",

			"prebuilt_res",

			"prebuilt_wlc_upt",

			"prebuilt_odm",

			"prebuilt_vendor_dlkm",

android/variable.go

+2 −0
Original line number Diff line number Diff line
@@ -669,6 +669,8 @@ type PartitionVariables struct { 
	VendorRamdiskKernelOptionsFile   string   `json:",omitempty"`



	ProductFsverityGenerateMetadata bool `json:",omitempty"`



	TargetScreenDensity string `json:",omitempty"`

}



func boolPtr(v bool) *bool {

fsgen/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ bootstrap_go_package { 
        "filesystem_creator.go",

        "fsgen_mutators.go",

        "prebuilt_etc_modules_gen.go",

        "util.go",

        "vbmeta_partitions.go",

    ],

    testSrcs: [

fsgen/filesystem_creator.go

+16 −0
Original line number Diff line number Diff line
@@ -415,6 +415,22 @@ func partitionSpecificFsProps(ctx android.EarlyModuleContext, fsProps *filesyste 
				"first_stage_ramdisk/sys",

			})

		}

	case "recovery":

		// Following https://cs.android.com/android/platform/superproject/main/+/main:build/make/core/Makefile;l=2826;drc=ad7cfb56010cb22c3aa0e70cf71c804352553526

		fsProps.Dirs = android.NewSimpleConfigurable([]string{

			"sdcard",

			"tmp",

		})

		fsProps.Symlinks = []filesystem.SymlinkDefinition{

			{

				Target: proptools.StringPtr("/system/bin/init"),

				Name:   proptools.StringPtr("init"),

			},

			{

				Target: proptools.StringPtr("prop.default"),

				Name:   proptools.StringPtr("default.prop"),

			},

		}

	}

}

fsgen/fsgen_mutators.go

+3 −0
Original line number Diff line number Diff line
@@ -162,6 +162,9 @@ func createFsGenState(ctx android.LoadHookContext, generatedPrebuiltEtcModuleNam 
			(*fsGenState.fsDeps["product"])["system_other_avbpubkey"] = defaultDepCandidateProps(ctx.Config())

		}



		// Add common resources `prebuilt_res` module as dep of recovery partition

		(*fsGenState.fsDeps["recovery"])[fmt.Sprintf("recovery-resources-common-%s", getDpi(ctx))] = defaultDepCandidateProps(ctx.Config())



		return &fsGenState

	}).(*FsGenState)

}