diff options
| author | 2024-05-31 23:03:11 +0000 | |
|---|---|---|
| committer | 2024-05-31 23:03:11 +0000 | |
| commit | 4333b79d9878caaef129ad7c03d91f4492402932 (patch) | |
| tree | 549ce9a6ef441dd13790e701543b0d5aec253a41 /java | |
| parent | 4c1b3ebc67396cfa5cee47d627d6aa4deccb2a84 (diff) | |
| parent | fb9191bcfe93b478591c21878d44c1c253a754bd (diff) | |
Merge "Change test_module_config from copying files to symlink files." into main am: fb9191bcfe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3060229
Change-Id: I8eefa9e1fae6a3d7909d0d4638648bc1405b03b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java')
| -rw-r--r-- | java/app.go | 2 | ||||
| -rw-r--r-- | java/java.go | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/java/app.go b/java/app.go index d2f2d0be1..a24099c28 100644 --- a/java/app.go +++ b/java/app.go @@ -1380,6 +1380,8 @@ func (a *AndroidTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { HostRequiredModuleNames: a.HostRequiredModuleNames(), TestSuites: a.testProperties.Test_suites, IsHost: false, + LocalCertificate: a.certificate.AndroidMkString(), + IsUnitTest: Bool(a.testProperties.Test_options.Unit_test), }) android.SetProvider(ctx, android.TestOnlyProviderKey, android.TestModuleInformation{ TestOnly: true, diff --git a/java/java.go b/java/java.go index 9fa6175ef..ccccbacdb 100644 --- a/java/java.go +++ b/java/java.go @@ -1504,6 +1504,8 @@ func (j *TestHost) GenerateAndroidBuildActions(ctx android.ModuleContext) { RequiredModuleNames: j.RequiredModuleNames(), TestSuites: j.testProperties.Test_suites, IsHost: true, + LocalSdkVersion: j.sdkVersion.String(), + IsUnitTest: Bool(j.testProperties.Test_options.Unit_test), }) } |