diff options
| author | 2025-01-29 17:53:23 -0800 | |
|---|---|---|
| committer | 2025-01-29 17:53:23 -0800 | |
| commit | bfbb9f560cc2483d2636fc9548766f0f8893e38d (patch) | |
| tree | a5d1543a6a5652b3773a7fad7d2cf9470d78bb9b | |
| parent | 2fc867c5f95bae65b7695c2280751b8f695f29f8 (diff) | |
| parent | 5f8a959940721cf9c631eccd7944a5256c48ce17 (diff) | |
Merge "Install java_test module test deps and configs in soong-only" into main am: 7904883318 am: 5f8a959940
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3469251
Change-Id: I3c548a1c5c740ed4753e3ac2cf3f595e7e8f3bd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | java/java.go | 16 | ||||
| -rw-r--r-- | java/java_test.go | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index 8d10e3bd2..d9a6b3556 100644 --- a/java/java.go +++ b/java/java.go @@ -1845,6 +1845,22 @@ func (j *Test) generateAndroidBuildActionsWithConfig(ctx android.ModuleContext, } } moduleInfoJSON.TestMainlineModules = append(moduleInfoJSON.TestMainlineModules, j.testProperties.Test_mainline_modules...) + + // Install test deps + if !ctx.Config().KatiEnabled() { + pathInTestCases := android.PathForModuleInstall(ctx, "testcases", ctx.ModuleName()) + if j.testConfig != nil { + ctx.InstallFile(pathInTestCases, ctx.ModuleName()+".config", j.testConfig) + } + testDeps := append(j.data, j.extraTestConfigs...) + for _, data := range android.SortedUniquePaths(testDeps) { + dataPath := android.DataPath{SrcPath: data} + ctx.InstallTestData(pathInTestCases, []android.DataPath{dataPath}) + } + if j.installFile != nil { + ctx.InstallFile(pathInTestCases, ctx.ModuleName()+".jar", j.installFile) + } + } } func (j *TestHelperLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) { diff --git a/java/java_test.go b/java/java_test.go index d415679bd..53d2f5c24 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -1916,7 +1916,7 @@ func TestDataDeviceBinsBuildsDeviceBinary(t *testing.T) { } actualData := entries.EntryMap["LOCAL_COMPATIBILITY_SUPPORT_FILES"] - android.AssertStringPathsRelativeToTopEquals(t, "LOCAL_TEST_DATA", ctx.Config, expectedData, actualData) + android.AssertStringPathsRelativeToTopEquals(t, "LOCAL_TEST_DATA", ctx.Config, android.SortedUniqueStrings(expectedData), android.SortedUniqueStrings(actualData)) }) } } |