Merge "Revert "Change test_module_config from copying files to symlink ..."" into main

2024-05-31 23:39:49 +00:00
parent fb9191bcfe c6a321e4de
commit d5e16ac52b
5 changed files with 65 additions and 175 deletions
--- a/java/app.go
+++ b/java/app.go
@@ -1380,8 +1380,6 @@ 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,
--- a/java/java.go
+++ b/java/java.go
@@ -1504,8 +1504,6 @@ 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),
 	})
 }