Use static build rules in snapshot generation
It is easier to extract information out of static build rules than it
is out of custom build rules built using the builder as the former
provides access to the in/out and args separate from the rule whereas
the latter only provides access to in/out.
Also, cleans up some warnings that appear in Intellij.
There is a lot of duplication in the testing code. That will be
resolved in a follow up change.
Bug: 143678475
Test: m conscrypt-module-sdk
Change-Id: I973bc0c90b0affd84487f1b222dd3e6c22c07ec0
diff --git a/sdk/sdk_test.go b/sdk/sdk_test.go
index 5435ef6..6c20659 100644
--- a/sdk/sdk_test.go
+++ b/sdk/sdk_test.go
@@ -27,7 +27,7 @@
"android/soong/java"
)
-func testSdkContext(t *testing.T, bp string) (*android.TestContext, android.Config) {
+func testSdkContext(bp string) (*android.TestContext, android.Config) {
config := android.TestArchConfig(buildDir, nil)
ctx := android.NewTestArchContext()
@@ -114,7 +114,7 @@
}
func testSdk(t *testing.T, bp string) (*android.TestContext, android.Config) {
- ctx, config := testSdkContext(t, bp)
+ ctx, config := testSdkContext(bp)
_, errs := ctx.ParseFileList(".", []string{"Android.bp"})
android.FailIfErrored(t, errs)
_, errs = ctx.PrepareBuildActions(config)
@@ -124,7 +124,7 @@
func testSdkError(t *testing.T, pattern, bp string) {
t.Helper()
- ctx, config := testSdkContext(t, bp)
+ ctx, config := testSdkContext(bp)
_, errs := ctx.ParseFileList(".", []string{"Android.bp"})
if len(errs) > 0 {
android.FailIfNoMatchingErrors(t, pattern, errs)
@@ -147,7 +147,7 @@
}
func pathsToStrings(paths android.Paths) []string {
- ret := []string{}
+ var ret []string
for _, p := range paths {
ret = append(ret, p.String())
}
@@ -554,14 +554,23 @@
var copySrcs []string
var copyDests []string
buildParams := sdk.BuildParamsForTests()
- var zipBp android.BuildParams
+ var mergeZipInputs []string
+ var intermediateZip string
+ var outputZip string
for _, bp := range buildParams {
ruleString := bp.Rule.String()
- if ruleString == "android/soong/android.Cp" {
+ if ruleString == android.Cp.String() {
copySrcs = append(copySrcs, bp.Input.String())
copyDests = append(copyDests, bp.Output.Rel()) // rooted at the snapshot root
- } else if ruleString == "<local rule>:m.mysdk_android_common.snapshot" {
- zipBp = bp
+ } else if ruleString == zipFiles.String() {
+ intermediateZip = bp.Output.String()
+ } else if ruleString == mergeZips.String() {
+ input := bp.Input.String()
+ if intermediateZip != input {
+ t.Errorf("Intermediate zip %s is not an input to merge_zips, %s is used instead", intermediateZip, input)
+ }
+ mergeZipInputs = bp.Inputs.Strings()
+ outputZip = bp.Output.String()
}
}
@@ -582,17 +591,14 @@
ensureListContains(t, copyDests, "java/myjavalib.jar")
ensureListContains(t, copyDests, "arm64/lib/mynativelib.so")
+ expectedOutputZip := filepath.Join(buildDir, ".intermediates/mysdk/android_common/mysdk-current.zip")
+ expectedRepackagedZip := filepath.Join(buildDir, ".intermediates/mysdk/android_common/tmp/java/myjavaapistubs_stubs_sources.zip")
+
// Ensure that the droidstubs .srcjar as repackaged into a temporary zip file
// and then merged together with the intermediate snapshot zip.
- snapshotCreationInputs := zipBp.Implicits.Strings()
- ensureListContains(t, snapshotCreationInputs,
- filepath.Join(buildDir, ".intermediates/mysdk/android_common/tmp/java/myjavaapistubs_stubs_sources.zip"))
- ensureListContains(t, snapshotCreationInputs,
- filepath.Join(buildDir, ".intermediates/mysdk/android_common/mysdk-current.unmerged.zip"))
- actual := zipBp.Output.String()
- expected := filepath.Join(buildDir, ".intermediates/mysdk/android_common/mysdk-current.zip")
- if actual != expected {
- t.Errorf("Expected snapshot output to be %q but was %q", expected, actual)
+ ensureListContains(t, mergeZipInputs, expectedRepackagedZip)
+ if outputZip != expectedOutputZip {
+ t.Errorf("Expected snapshot output to be %q but was %q", expectedOutputZip, outputZip)
}
}
@@ -749,14 +755,23 @@
var copySrcs []string
var copyDests []string
buildParams := sdk.BuildParamsForTests()
- var zipBp android.BuildParams
+ var mergeZipInputs []string
+ var intermediateZip string
+ var outputZip string
for _, bp := range buildParams {
ruleString := bp.Rule.String()
- if ruleString == "android/soong/android.Cp" {
+ if ruleString == android.Cp.String() {
copySrcs = append(copySrcs, bp.Input.String())
copyDests = append(copyDests, bp.Output.Rel()) // rooted at the snapshot root
- } else if ruleString == "<local rule>:m.mysdk_linux_glibc_common.snapshot" {
- zipBp = bp
+ } else if ruleString == zipFiles.String() {
+ intermediateZip = bp.Output.String()
+ } else if ruleString == mergeZips.String() {
+ input := bp.Input.String()
+ if intermediateZip != input {
+ t.Errorf("Intermediate zip %s is not an input to merge_zips, %s is used instead", intermediateZip, input)
+ }
+ mergeZipInputs = bp.Inputs.Strings()
+ outputZip = bp.Output.String()
}
}
@@ -777,17 +792,14 @@
ensureListContains(t, copyDests, "java/myjavalib.jar")
ensureListContains(t, copyDests, "x86_64/lib/mynativelib.so")
+ expectedOutputZip := filepath.Join(buildDir, ".intermediates/mysdk/linux_glibc_common/mysdk-current.zip")
+ expectedRepackagedZip := filepath.Join(buildDir, ".intermediates/mysdk/linux_glibc_common/tmp/java/myjavaapistubs_stubs_sources.zip")
+
// Ensure that the droidstubs .srcjar as repackaged into a temporary zip file
// and then merged together with the intermediate snapshot zip.
- snapshotCreationInputs := zipBp.Implicits.Strings()
- ensureListContains(t, snapshotCreationInputs,
- filepath.Join(buildDir, ".intermediates/mysdk/linux_glibc_common/tmp/java/myjavaapistubs_stubs_sources.zip"))
- ensureListContains(t, snapshotCreationInputs,
- filepath.Join(buildDir, ".intermediates/mysdk/linux_glibc_common/mysdk-current.unmerged.zip"))
- actual := zipBp.Output.String()
- expected := filepath.Join(buildDir, ".intermediates/mysdk/linux_glibc_common/mysdk-current.zip")
- if actual != expected {
- t.Errorf("Expected snapshot output to be %q but was %q", expected, actual)
+ ensureListContains(t, mergeZipInputs, expectedRepackagedZip)
+ if outputZip != expectedOutputZip {
+ t.Errorf("Expected snapshot output to be %q but was %q", expectedOutputZip, outputZip)
}
}
@@ -810,7 +822,7 @@
}
func tearDown() {
- os.RemoveAll(buildDir)
+ _ = os.RemoveAll(buildDir)
}
func TestMain(m *testing.M) {