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

Unverified Commit 723ebcb1 authored by Luca Stefani's avatar Luca Stefani Committed by Michael Bestas
Browse files

Don't manually add lineage res to apps 

Only exception left is the hard dep of framework-res
into org.lineage.platform-res

Change-Id: I02585a6581da75a442b2967c89a51929d4778ea4
parent c8107f4c

java/base.go

+0 −14
Original line number Diff line number Diff line
@@ -1648,20 +1648,6 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps { 
			return

		}



		if tag == lineageResTag {

			if ctx.ModuleName() == "org.lineageos.platform" ||

				ctx.ModuleName() == "org.lineageos.platform.internal" ||

				ctx.ModuleName() == "org.lineageos.platform.sdk" {

				// org.lineageos.platform.jar has a one-off dependency on the R.java and Manifest.java files

				// generated by org.lineageos.platform-res.apk

				deps.srcJars = append(deps.srcJars, module.(*AndroidApp).aaptSrcJar)

			}

			if ctx.ModuleName() == "framework" {

				// framework.jar has a one-off dependency on the R.java and Manifest.java files

				// generated by org.lineageos.platform-res.apk

				deps.srcJars = append(deps.srcJars, module.(*AndroidApp).aaptSrcJar)

			}

		}

		if dep, ok := module.(SdkLibraryDependency); ok {

			switch tag {

			case libTag:

java/java.go

+0 −8
Original line number Diff line number Diff line
@@ -349,17 +349,9 @@ func sdkDeps(ctx android.BottomUpMutatorContext, sdkContext android.SdkContext, 
	if sdkDep.systemModules != "" {

		ctx.AddVariationDependencies(nil, systemModulesTag, sdkDep.systemModules)

	}

	if ctx.ModuleName() == "framework" || ctx.ModuleName() == "framework-annotation-proc" {

		ctx.AddDependency(ctx.Module(), lineageResTag, "org.lineageos.platform-res")

	}

	if ctx.ModuleName() == "org.lineageos.platform-res" {

		ctx.AddDependency(ctx.Module(), frameworkResTag, "framework-res")

	}

	if ctx.ModuleName() == "org.lineageos.platform" ||

		ctx.ModuleName() == "org.lineageos.platform.internal" ||

		ctx.ModuleName() == "org.lineageos.platform.sdk" {

		ctx.AddDependency(ctx.Module(), lineageResTag, "org.lineageos.platform-res")

	}

}



type deps struct {