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

Commit 548051b7 authored by Yu Liu's avatar Yu Liu Committed by Automerger Merge Worker
Browse files

Merge "Support abi check in mixed build." am: 3f32b38c 

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



Change-Id: I090dcf213d497082c29f475527bb7fdcaece6b4b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b4c2b782 3f32b38c

bazel/cquery/request_type.go

+7 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ type CcInfo struct { 
	TidyFiles            []string

	TocFile              string

	UnstrippedOutput     string

	AbiDiffFiles         []string

}



type getOutputFilesRequestType struct{}
@@ -174,6 +175,11 @@ clang_tidy_info = p.get("//build/bazel/rules/cc:clang_tidy.bzl%ClangTidyInfo") 
if clang_tidy_info:

  tidy_files = [v.path for v in clang_tidy_info.tidy_files.to_list()]



abi_diff_files = []

abi_diff_info = p.get("//build/bazel/rules/abi:abi_dump.bzl%AbiDiffInfo")

if abi_diff_info:

  abi_diff_files = [f.path for f in abi_diff_info.diff_files.to_list()]



return json_encode({

	"OutputFiles": outputFiles,

	"CcObjectFiles": ccObjectFiles,
@@ -187,6 +193,7 @@ return json_encode({ 
	"TidyFiles": tidy_files,

	"TocFile": toc_file,

	"UnstrippedOutput": unstripped,

	"AbiDiffFiles": abi_diff_files,

})`



}

cc/library.go

+4 −0
Original line number Diff line number Diff line
@@ -905,6 +905,10 @@ func (handler *ccLibraryBazelHandler) generateSharedBazelBuildActions(ctx androi 
	}

	handler.module.linker.(*libraryDecorator).tocFile = tocFile



	if len(ccInfo.AbiDiffFiles) > 0 {

		handler.module.linker.(*libraryDecorator).sAbiDiff = android.PathsForBazelOut(ctx, ccInfo.AbiDiffFiles)

	}



	ctx.SetProvider(SharedLibraryInfoProvider, SharedLibraryInfo{

		TableOfContents: tocFile,

		SharedLibrary:   outputFilePath,