From 51db20a202f07f182db2f762852f0388e935c8ba Mon Sep 17 00:00:00 2001
From: Yan Yan <evitayan@google.com>
Date: Tue, 21 Jan 2025 15:30:05 -0800
Subject: [PATCH] Set min_sdk_version of framework-connectivity-b to 36

VCN will be moved to Tethering module from Android B. Thus
setting the min_sdk_version to 36

Bug: 390096003
Test: atest FrameworkVcnTests && atest CtsVcnTestCases
Test: Enable VCN in mainline, sideload module and
      run mts-user -m CtsStrictJavaPackagesTestCases on AP3A
Flag: EXEMPT; bug fix
Change-Id: I427b2e0231e2ccdc870500399be9387036b14edc
---
 Vcn/framework-b/Android.bp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Vcn/framework-b/Android.bp b/Vcn/framework-b/Android.bp
index edb22c0e7a..c531233598 100644
--- a/Vcn/framework-b/Android.bp
+++ b/Vcn/framework-b/Android.bp
@@ -77,8 +77,7 @@ framework_connectivity_b_defaults_soong_config {
     ],
     soong_config_variables: {
         is_vcn_in_mainline: {
-            //TODO: b/380155299 Make it Baklava when aidl tool can understand it
-            min_sdk_version: "current",
+            min_sdk_version: "36",
             static_libs: ["android.net.vcn.flags-aconfig-java"],
             apex_available: ["com.android.tethering"],