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

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

Merge "Remove unnecessary handling of nil paths in HiddenAPIOutput" am:... 

Merge "Remove unnecessary handling of nil paths in HiddenAPIOutput" am: 38788dce am: b4186d80 am: 2874b499 am: 3a457a94

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

Change-Id: Ifc18ccf1f2a85d1ad001e80cce231de886822dfa
parents ad8987fc 3a457a94

java/hiddenapi_monolithic.go

+5 −16
Original line number Diff line number Diff line
@@ -83,22 +83,11 @@ func newMonolithicHiddenAPIInfo(ctx android.ModuleContext, flagFilesByCategory F 
// append appends all the files from the supplied info to the corresponding files in this struct.

func (i *MonolithicHiddenAPIInfo) append(other *HiddenAPIInfo) {

	i.FlagsFilesByCategory.append(other.FlagFilesByCategory)



	// The output may not be set if the bootclasspath_fragment has not yet been updated to support

	// hidden API processing.

	// TODO(b/179354495): Switch back to append once all bootclasspath_fragment modules have been

	//  updated to support hidden API processing properly.

	appendIfNotNil := func(paths android.Paths, path android.Path) android.Paths {

		if path == nil {

			return paths

		}

		return append(paths, path)

	}

	i.StubFlagsPaths = appendIfNotNil(i.StubFlagsPaths, other.StubFlagsPath)

	i.AnnotationFlagsPaths = appendIfNotNil(i.AnnotationFlagsPaths, other.AnnotationFlagsPath)

	i.MetadataPaths = appendIfNotNil(i.MetadataPaths, other.MetadataPath)

	i.IndexPaths = appendIfNotNil(i.IndexPaths, other.IndexPath)

	i.AllFlagsPaths = appendIfNotNil(i.AllFlagsPaths, other.AllFlagsPath)

	i.StubFlagsPaths = append(i.StubFlagsPaths, other.StubFlagsPath)

	i.AnnotationFlagsPaths = append(i.AnnotationFlagsPaths, other.AnnotationFlagsPath)

	i.MetadataPaths = append(i.MetadataPaths, other.MetadataPath)

	i.IndexPaths = append(i.IndexPaths, other.IndexPath)

	i.AllFlagsPaths = append(i.AllFlagsPaths, other.AllFlagsPath)

}



// dedup removes duplicates in all the paths, while maintaining the order in which they were