diff options
| author | Colin Cross <ccross@android.com> | 2021-07-20 09:47:41 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2021-07-20 12:46:48 -0700 |
| commit | 0c66bc615b399d2201b15b4c9052066db04a3f5e (patch) | |
| tree | be8334e4662f4bf137d2231dc92755e44fc85d5e /java/kotlin_test.go | |
| parent | ae86338676084cf5966adf99f34e7086f9687edc (diff) | |
Replace android.BuildOs with Config.BuildOS
Replace the android.BuildOs constant with Config.BuildOS so that it
can vary based on the product config.
Bug: 190084016
Test: all Soong tests
Change-Id: Ia67f872d8b2ab788747a22e3a9659dc21c9775cd
Diffstat (limited to 'java/kotlin_test.go')
| -rw-r--r-- | java/kotlin_test.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/kotlin_test.go b/java/kotlin_test.go index fd2f3ca61..db3069693 100644 --- a/java/kotlin_test.go +++ b/java/kotlin_test.go @@ -15,10 +15,11 @@ package java import ( - "android/soong/android" "strconv" "strings" "testing" + + "android/soong/android" ) func TestKotlin(t *testing.T) { @@ -114,7 +115,7 @@ func TestKapt(t *testing.T) { t.Run("", func(t *testing.T) { ctx, _ := testJava(t, bp) - buildOS := android.BuildOs.String() + buildOS := ctx.Config().BuildOS.String() kapt := ctx.ModuleForTests("foo", "android_common").Rule("kapt") kotlinc := ctx.ModuleForTests("foo", "android_common").Rule("kotlinc") @@ -182,7 +183,7 @@ func TestKapt(t *testing.T) { android.FixtureMergeEnv(env), ).RunTestWithBp(t, bp) - buildOS := android.BuildOs.String() + buildOS := result.Config.BuildOS.String() kapt := result.ModuleForTests("foo", "android_common").Rule("kapt") javac := result.ModuleForTests("foo", "android_common").Description("javac") |