From 5650a2bccefe8bc9b0ea2097eed9246880451302 Mon Sep 17 00:00:00 2001
From: Automerger Merge Worker
 <android-build-automerger-merge-worker@system.gserviceaccount.com>
Date: Tue, 25 Feb 2020 04:34:26 +0000
Subject: [PATCH] Build framework-tethering against module_current

Bug: 146757305
Test: build

Change-Id: Id6051296a02060179666b67fc6ea9092273c1780
Merged-In: Id6051296a02060179666b67fc6ea9092273c1780
Merged-In: Iad504f0e709daadfb4d86205c07f0faf429f5a8f
(cherry picked from commit bb09ceaf09c8aea00a5001ba7079c13a2575e809)
---
 Tethering/common/TetheringLib/Android.bp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp
index 1a3d5b659e..5b73dd53a2 100644
--- a/Tethering/common/TetheringLib/Android.bp
+++ b/Tethering/common/TetheringLib/Android.bp
@@ -41,8 +41,7 @@ aidl_interface {
 
 java_library {
     name: "framework-tethering",
-    // TODO (b/146757305): change to module_app_current once available
-    sdk_version: "core_platform",
+    sdk_version: "module_current",
     srcs: [
         "src/android/net/TetheredClient.java",
         "src/android/net/TetheringManager.java",
@@ -56,7 +55,6 @@ java_library {
 
     libs: [
         "framework-annotations-lib",
-        "android_system_stubs_current",
     ],
 
     hostdex: true, // for hiddenapi check