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

Commit eb912dcc authored by Yo Chiang's avatar Yo Chiang
Browse files

Improve abidump generating logic for non-REL build 

Optimize build by removing redundant edges from the dependency graph.
After this change abidump files (.sdump, .lsdump, .abidiff) are built
only if (1) building phony target `findlsdumps` or (2) reference dump
is present under prebuilts/, which is the case for REL branches.

This improves the build time by 1.5 minutes on my machine.

Also remove HEADER_ABI_DIFFS because it has no user anymore.

Bug: 162301547
Test: (on master) m && .sdump and .lsdump is not generated
Test: (on REL br) m && .sdump, .lsdump and .abidiff are generated
Change-Id: Ie040371d8fd57f91ec6f0cd4d37483167ef9c445
parent 8c69770f

cc/androidmk.go

+4 −18
Original line number Diff line number Diff line
@@ -206,29 +206,15 @@ func (library *libraryDecorator) androidMkWriteExportedFlags(entries *android.An 
}



func (library *libraryDecorator) androidMkEntriesWriteAdditionalDependenciesForSourceAbiDiff(entries *android.AndroidMkEntries) {

	if library.sAbiOutputFile.Valid() {

		entries.SetString("LOCAL_ADDITIONAL_DEPENDENCIES",

			"$(LOCAL_ADDITIONAL_DEPENDENCIES) "+library.sAbiOutputFile.String())

	if library.sAbiDiff.Valid() && !library.static() {

			entries.SetString("LOCAL_ADDITIONAL_DEPENDENCIES",

				"$(LOCAL_ADDITIONAL_DEPENDENCIES) "+library.sAbiDiff.String())

			entries.SetString("HEADER_ABI_DIFFS",

				"$(HEADER_ABI_DIFFS) "+library.sAbiDiff.String())

		}

		entries.AddStrings("LOCAL_ADDITIONAL_DEPENDENCIES", library.sAbiDiff.String())

	}

}



// TODO(ccross): remove this once apex/androidmk.go is converted to AndroidMkEntries

func (library *libraryDecorator) androidMkWriteAdditionalDependenciesForSourceAbiDiff(w io.Writer) {

	if library.sAbiOutputFile.Valid() {

		fmt.Fprintln(w, "LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_ADDITIONAL_DEPENDENCIES) ",

			library.sAbiOutputFile.String())

	if library.sAbiDiff.Valid() && !library.static() {

			fmt.Fprintln(w, "LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_ADDITIONAL_DEPENDENCIES) ",

				library.sAbiDiff.String())

			fmt.Fprintln(w, "HEADER_ABI_DIFFS := $(HEADER_ABI_DIFFS) ",

				library.sAbiDiff.String())

		}

		fmt.Fprintln(w, "LOCAL_ADDITIONAL_DEPENDENCIES +=", library.sAbiDiff.String())

	}

}