From 893f84f96e77c820665cc52b0617c2066141b800 Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Fri, 9 May 2025 13:26:04 +0900 Subject: [PATCH] Clean up an old flag for removed downstream branches Test: TH Flag: EXEMPT test-only Change-Id: I4a860c7c42afdfb5249b787daee80395096f5c84 --- staticlibs/testutils/Android.bp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/staticlibs/testutils/Android.bp b/staticlibs/testutils/Android.bp index e2b46310a4..24257eb569 100644 --- a/staticlibs/testutils/Android.bp +++ b/staticlibs/testutils/Android.bp @@ -67,14 +67,6 @@ java_library { "//packages/modules/Connectivity/tests/cts/hostside", "//external/cronet:__subpackages__", ], - // There are downstream branches using an old version of Kotlin - // that used to reserve the right to make breaking changes to the - // Result type and disallowed returning an instance of it. - // Later versions allowed this and there was never a change, - // so no matter the version returning Result is always fine, - // but on sc-mainline-prod the compiler rejects it without - // the following flag. - kotlincflags: ["-Xallow-result-return-type"], libs: [ "jsr305", ],