StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Code Metadata rule to soong/testing. am: 8094b6bf9d

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

Change-Id: I40154b3f9d2c170cb7aacbf6f0b9383b2e87f444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aditya Choudhary
2023-12-06 08:11:01 +00:00
committed by Automerger Merge Worker
parent 64a51889e8 8094b6bf9d
commit 7d37796d24
25 changed files with 1042 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/Android.bp
View File

@@ -86,6 +86,7 @@ bootstrap_go_package {
"app_import_test.go",
"app_set_test.go",
"app_test.go",
"code_metadata_test.go",
"bootclasspath_fragment_test.go",
"device_host_converter_test.go",
"dex_test.go",

125
java/code_metadata_test.go Normal file
View File

@@ -0,0 +1,125 @@
package java
import (
"strings"
"testing"
"android/soong/android"
soongTesting "android/soong/testing"
"android/soong/testing/code_metadata_internal_proto"
"google.golang.org/protobuf/proto"
)
func TestCodeMetadata(t *testing.T) {
bp := `code_metadata {
name: "module-name",
teamId: "12345",
code: [
"foo",
]
}
java_sdk_library {
name: "foo",
srcs: ["a.java"],
}`
result := runCodeMetadataTest(t, android.FixtureExpectsNoErrors, bp)
module := result.ModuleForTests(
"module-name", "",
).Module().(*soongTesting.CodeMetadataModule)
// Check that the provider has the right contents
data := result.ModuleProvider(
module, soongTesting.CodeMetadataProviderKey,
).(soongTesting.CodeMetadataProviderData)
if !strings.HasSuffix(
data.IntermediatePath.String(), "/intermediateCodeMetadata.pb",
) {
t.Errorf(
"Missing intermediates path in provider: %s",
data.IntermediatePath.String(),
)
}
buildParamsSlice := module.BuildParamsForTests()
var metadata = ""
for _, params := range buildParamsSlice {
if params.Rule.String() == "android/soong/android.writeFile" {
metadata = params.Args["content"]
}
}
metadataList := make([]*code_metadata_internal_proto.CodeMetadataInternal_TargetOwnership, 0, 2)
teamId := "12345"
bpFilePath := "Android.bp"
targetName := "foo"
srcFile := []string{"a.java"}
expectedMetadataProto := code_metadata_internal_proto.CodeMetadataInternal_TargetOwnership{
TrendyTeamId: &teamId,
TargetName: &targetName,
Path: &bpFilePath,
SourceFiles: srcFile,
}
metadataList = append(metadataList, &expectedMetadataProto)
CodeMetadataMetadata := code_metadata_internal_proto.CodeMetadataInternal{TargetOwnershipList: metadataList}
protoData, _ := proto.Marshal(&CodeMetadataMetadata)
rawData := string(protoData)
formattedData := strings.ReplaceAll(rawData, "\n", "\\n")
expectedMetadata := "'" + formattedData + "\\n'"
if metadata != expectedMetadata {
t.Errorf(
"Retrieved metadata: %s is not equal to expectedMetadata: %s", metadata,
expectedMetadata,
)
}
// Tests for all_test_spec singleton.
singleton := result.SingletonForTests("all_code_metadata")
rule := singleton.Rule("all_code_metadata_rule")
prebuiltOs := result.Config.PrebuiltOS()
expectedCmd := "out/soong/host/" + prebuiltOs + "/bin/metadata -rule code_metadata -inputFile out/soong/all_code_metadata_paths.rsp -outputFile out/soong/ownership/all_code_metadata.pb"
expectedOutputFile := "out/soong/ownership/all_code_metadata.pb"
expectedInputFile := "out/soong/.intermediates/module-name/intermediateCodeMetadata.pb"
if !strings.Contains(
strings.TrimSpace(rule.Output.String()),
expectedOutputFile,
) {
t.Errorf(
"Retrieved singletonOutputFile: %s is not equal to expectedSingletonOutputFile: %s",
rule.Output.String(), expectedOutputFile,
)
}
if !strings.Contains(
strings.TrimSpace(rule.Inputs[0].String()),
expectedInputFile,
) {
t.Errorf(
"Retrieved singletonInputFile: %s is not equal to expectedSingletonInputFile: %s",
rule.Inputs[0].String(), expectedInputFile,
)
}
if !strings.Contains(
strings.TrimSpace(rule.RuleParams.Command),
expectedCmd,
) {
t.Errorf(
"Retrieved cmd: %s doesn't contain expectedCmd: %s",
rule.RuleParams.Command, expectedCmd,
)
}
}
func runCodeMetadataTest(
t *testing.T, errorHandler android.FixtureErrorHandler, bp string,
) *android.TestResult {
return android.GroupFixturePreparers(
soongTesting.PrepareForTestWithTestingBuildComponents, prepareForJavaTest,
PrepareForTestWithJavaSdkLibraryFiles, FixtureWithLastReleaseApis("foo"),
).
ExtendWithErrorHandler(errorHandler).
RunTestWithBp(t, bp)
}

1
java/sdk_library.go
View File

@@ -1477,6 +1477,7 @@ func (module *SdkLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext)
}
}
ctx.SetProvider(android.AdditionalSdkInfoProvider, android.AdditionalSdkInfo{additionalSdkInfo})
ctx.SetProvider(android.SrcsFileProviderKey, android.SrcsFileProviderData{SrcPaths: module.uniqueSrcFiles})
}
func (module *SdkLibrary) AndroidMkEntries() []android.AndroidMkEntries {

10
java/test_spec_test.go
View File

@@ -27,7 +27,7 @@ func TestTestSpec(t *testing.T) {
java_test {
name: "java-test-module-name-two",
}`
result := runTest(t, android.FixtureExpectsNoErrors, bp)
result := runTestSpecTest(t, android.FixtureExpectsNoErrors, bp)
module := result.ModuleForTests(
"module-name", "",
@@ -78,7 +78,7 @@ func TestTestSpec(t *testing.T) {
if metadata != expectedMetadata {
t.Errorf(
"Retrieved metadata: %s is not equal to expectedMetadata: %s", metadata,
"Retrieved metadata: %s doesn't contain expectedMetadata: %s", metadata,
expectedMetadata,
)
}
@@ -121,11 +121,11 @@ func TestTestSpec(t *testing.T) {
}
}
func runTest(
t *testing.T, errorHandler android.FixtureErrorHandler, bp string,
func runTestSpecTest(
t *testing.T, errorHandler android.FixtureErrorHandler, bp string,
) *android.TestResult {
return android.GroupFixturePreparers(
soongTesting.PrepareForTestWithTestSpecBuildComponents,
soongTesting.PrepareForTestWithTestingBuildComponents,
PrepareForIntegrationTestWithJava,
).
ExtendWithErrorHandler(errorHandler).