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

Commit 8383972e authored by Tej Singh's avatar Tej Singh
Browse files

Revert "Always run package check" 

This reverts commit aa7359ab.

Reason for revert: package-check.sh doesn't work on mac

Change-Id: Ia3dcee612c1f6b4121e1351c8710638ae41bc88a
Merged-In: I50af71d54d5f1f8b516bfcf1efbcf6217e89c83a
parent aa7359ab

java/androidmk.go

+24 −1
Original line number Diff line number Diff line
@@ -69,7 +69,26 @@ func (library *Library) AndroidMkEntries() []android.AndroidMkEntries { 
	if !library.ApexModuleBase.AvailableFor(android.AvailableToPlatform) {

		hideFromMake = true

	}

	if !hideFromMake {

	if hideFromMake {

		// May still need to add some additional dependencies. This will be called

		// once for the platform variant (even if it is not being used) and once each

		// for the APEX specific variants. In order to avoid adding the dependency

		// multiple times only add it for the platform variant.

		checkedModulePaths := library.additionalCheckedModules

		if library.IsForPlatform() && len(checkedModulePaths) != 0 {

			mainEntries = android.AndroidMkEntries{

				Class: "FAKE",

				// Need at least one output file in order for this to take effect.

				OutputFile: android.OptionalPathForPath(checkedModulePaths[0]),

				Include:    "$(BUILD_PHONY_PACKAGE)",

				ExtraEntries: []android.AndroidMkExtraEntriesFunc{

					func(entries *android.AndroidMkEntries) {

						entries.AddStrings("LOCAL_ADDITIONAL_CHECKED_MODULE", checkedModulePaths.Strings()...)

					},

				},

			}

		}

	} else {

		mainEntries = android.AndroidMkEntries{

			Class:      "JAVA_LIBRARIES",

			DistFile:   android.OptionalPathForPath(library.distFile),
@@ -104,6 +123,10 @@ func (library *Library) AndroidMkEntries() []android.AndroidMkEntries { 


					entries.AddStrings("LOCAL_EXPORT_SDK_LIBRARIES", library.exportedSdkLibs...)



					if len(library.additionalCheckedModules) != 0 {

						entries.AddStrings("LOCAL_ADDITIONAL_CHECKED_MODULE", library.additionalCheckedModules.Strings()...)

					}



					if library.proguardDictionary != nil {

						entries.SetPath("LOCAL_SOONG_PROGUARD_DICT", library.proguardDictionary)

					}

java/builder.go

+3 −6
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ var ( 
		blueprint.RuleParams{

			Command: "rm -f $out && " +

				"${config.PackageCheckCmd} $in $packages && " +

				"cp $in $out",

				"touch $out",

			CommandDeps: []string{"${config.PackageCheckCmd}"},

		},

		"packages")
@@ -547,9 +547,8 @@ func TransformJarJar(ctx android.ModuleContext, outputFile android.WritablePath, 
	})

}



func CheckJarPackages(ctx android.ModuleContext, classesJar android.Path, permittedPackages []string) android.ModuleOutPath {

	outputFile := android.PathForModuleOut(ctx, "package-check", classesJar.Base())



func CheckJarPackages(ctx android.ModuleContext, outputFile android.WritablePath,

	classesJar android.Path, permittedPackages []string) {

	ctx.Build(pctx, android.BuildParams{

		Rule:        packageCheck,

		Description: "packageCheck",
@@ -559,8 +558,6 @@ func CheckJarPackages(ctx android.ModuleContext, classesJar android.Path, permit 
			"packages": strings.Join(permittedPackages, " "),

		},

	})



	return outputFile

}



func TransformJetifier(ctx android.ModuleContext, outputFile android.WritablePath,

java/java.go

+7 −4
Original line number Diff line number Diff line
@@ -467,6 +467,9 @@ type Module struct { 
	// expanded Jarjar_rules

	expandJarjarRules android.Path



	// list of additional targets for checkbuild

	additionalCheckedModules android.Paths



	// Extra files generated by the module type to be added as java resources.

	extraResources android.Paths
@@ -1524,10 +1527,10 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { 


	// Check package restrictions if necessary.

	if len(j.properties.Permitted_packages) > 0 {

		// Check packages and copy input to package-checked file.

		// Use the file copied after a successful package check as the output file for this

		// module so that any dependencies on this module will trigger the package check.

		outputFile = CheckJarPackages(ctx, outputFile, j.properties.Permitted_packages)

		// Check packages and copy to package-checked file.

		pkgckFile := android.PathForModuleOut(ctx, "package-check.stamp")

		CheckJarPackages(ctx, pkgckFile, outputFile, j.properties.Permitted_packages)

		j.additionalCheckedModules = append(j.additionalCheckedModules, pkgckFile)



		if ctx.Failed() {

			return