commit dd6177b50179386a2971140eb28f5aa2135bb235
author markchien <markchien@google.com> Mon Sep 23 20:29:54 2019 +0800
committer Mark Chien <markchien@google.com> Wed Oct 30 11:06:28 2019 +0000
tree d5b5c2db4e7f4a91e610bcbe739302f7040f0287
parent 74a4fa9b3703c3fca972f7aca4d304adc0d69876

[Tether04] Migrate EntitlementManager into module

Bug: 136040414
Test: -build, flash, boot
      -atest TetheringTests
      -atest FrameworksNetTests

Change-Id: Ifdfc6cd95377351c37946a146b60896f07ece59d
Merged-In: Ifdfc6cd95377351c37946a146b60896f07ece59d

Tethering/Android.bp

diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index ca69c18..2bfe287 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -21,6 +21,7 @@
         "src/**/*.java",
         ":framework-tethering-shared-srcs",
         ":services-tethering-shared-srcs",
+        ":servicescore-tethering-src",
     ],
     static_libs: [
         "androidx.annotation_annotation",
@@ -67,9 +68,17 @@
 
 // This group will be removed when tethering migration is done.
 filegroup {
-    name: "tethering-services-srcs",
+    name: "tethering-servicescore-srcs",
     srcs: [
+        "src/com/android/server/connectivity/tethering/EntitlementManager.java",
         "src/com/android/server/connectivity/tethering/TetheringConfiguration.java",
+    ],
+}
+
+// This group will be removed when tethering migration is done.
+filegroup {
+    name: "tethering-servicesnet-srcs",
+    srcs: [
         "src/android/net/dhcp/DhcpServerCallbacks.java",
         "src/android/net/dhcp/DhcpServingParamsParcelExt.java",
         "src/android/net/ip/IpServer.java",