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

Commit 4af54d88 authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Remove unnecessary additionalCheckedModules field am: 0b58fdb0 am: 6c68db45 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1842815

Change-Id: Ic0b41ae1d3af825d685e8f5df3b9404499f98092
parents 93865343 6c68db45

java/androidmk.go

+1 −21
Original line number Diff line number Diff line
@@ -71,23 +71,7 @@ func (library *Library) AndroidMkEntries() []android.AndroidMkEntries { 
		entriesList = append(entriesList, android.AndroidMkEntries{Disabled: true})

	} else if !library.ApexModuleBase.AvailableFor(android.AvailableToPlatform) {

		// Platform variant.  If not available for the platform, we don't need Make module.

		// May still need to add some additional dependencies.

		checkedModulePaths := library.additionalCheckedModules

		if len(checkedModulePaths) != 0 {

			entriesList = append(entriesList, 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(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {

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

					},

				},

			})

		} else {

		entriesList = append(entriesList, android.AndroidMkEntries{Disabled: true})

		}

	} else {

		entriesList = append(entriesList, android.AndroidMkEntries{

			Class:      "JAVA_LIBRARIES",
@@ -123,10 +107,6 @@ func (library *Library) AndroidMkEntries() []android.AndroidMkEntries { 
					requiredUsesLibs, optionalUsesLibs := library.classLoaderContexts.UsesLibs()

					entries.AddStrings("LOCAL_EXPORT_SDK_LIBRARIES", append(requiredUsesLibs, optionalUsesLibs...)...)



					if len(library.additionalCheckedModules) != 0 {

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

					}



					entries.SetOptionalPath("LOCAL_SOONG_PROGUARD_DICT", library.dexer.proguardDictionary)

					entries.SetOptionalPath("LOCAL_SOONG_PROGUARD_USAGE_ZIP", library.dexer.proguardUsageZip)

					entries.SetString("LOCAL_MODULE_STEM", library.Stem())

java/base.go

+0 −3
Original line number Diff line number Diff line
@@ -433,9 +433,6 @@ 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