diff options
Diffstat (limited to 'sysprop')
-rw-r--r-- | sysprop/sysprop_test.go | 60 |
1 files changed, 4 insertions, 56 deletions
diff --git a/sysprop/sysprop_test.go b/sysprop/sysprop_test.go index 92e0af4b..745e4241 100644 --- a/sysprop/sysprop_test.go +++ b/sysprop/sysprop_test.go @@ -19,7 +19,6 @@ import ( "android/soong/cc" "android/soong/java" - "fmt" "io/ioutil" "os" "strings" @@ -90,54 +89,7 @@ func testContext(config android.Config, bp string, ctx.Register() - extraModules := []string{ - "core-lambda-stubs", - "framework", - "ext", - "updatable_media_stubs", - - "android_stubs_current", - "android_system_stubs_current", - "android_test_stubs_current", - "core.current.stubs", - "core.platform.api.stubs", - } - - for _, extra := range extraModules { - bp += fmt.Sprintf(` - java_library { - name: "%s", - srcs: ["a.java"], - no_standard_libs: true, - sdk_version: "core_current", - system_modules: "core-platform-api-stubs-system-modules", - } - `, extra) - } - - bp += ` - android_app { - name: "framework-res", - no_framework_libs: true, - } - ` - - systemModules := []string{ - "core-system-modules", - "core-platform-api-stubs-system-modules", - "android_stubs_current_system_modules", - "android_system_stubs_current_system_modules", - "android_test_stubs_current_system_modules", - } - - for _, extra := range systemModules { - bp += fmt.Sprintf(` - java_system_modules { - name: "%s", - } - `, extra) - } - + bp += java.GatherRequiredDepsForTest() bp += cc.GatherRequiredDepsForTest(android.Android) mockFS := map[string][]byte{ @@ -224,16 +176,12 @@ func run(t *testing.T, ctx *android.TestContext, config android.Config) { } func testConfig(env map[string]string) android.Config { - if env == nil { - env = make(map[string]string) - } - if env["ANDROID_JAVA8_HOME"] == "" { - env["ANDROID_JAVA8_HOME"] = "jdk8" - } - config := android.TestArchConfig(buildDir, env) + config := java.TestConfig(buildDir, env) + config.TestProductVariables.DeviceSystemSdkVersions = []string{"28"} config.TestProductVariables.DeviceVndkVersion = proptools.StringPtr("current") config.TestProductVariables.Platform_vndk_version = proptools.StringPtr("VER") + return config } |