From 369c920552d28b3ac759035f89af06f83b9db684 Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Thu, 9 Jan 2020 18:09:56 -0800
Subject: [PATCH] Jarjar more classes into framework-wifi

Jarjar annotations, Inet4AddressUtils,
and HandlerExecutor into framework-wifi.jar.

Statically link Wifi hardware constants as well.

Bug: 142886292
Test: boots up and connects to wifi

Change-Id: Ib0e2e55ae5158d65dd012511ac3d4d2a73225b57
---
 Android.bp            | 13 ++++++++++---
 wifi/Android.bp       |  5 ++++-
 wifi/jarjar-rules.txt |  4 +++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Android.bp b/Android.bp
index 9a0bd737229e..40af203443a6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -348,7 +348,6 @@ java_library {
         "android.hardware.vibrator-V1.1-java",
         "android.hardware.vibrator-V1.2-java",
         "android.hardware.vibrator-V1.3-java",
-        "android.hardware.wifi-V1.0-java-constants",
         "devicepolicyprotosnano",
 
         "com.android.sysprop.apex",
@@ -506,7 +505,10 @@ java_library {
     defaults: ["framework-defaults"],
     srcs: [":framework-all-sources"],
     installable: false,
-    static_libs: ["exoplayer2-core"],
+    static_libs: [
+        "exoplayer2-core",
+        "android.hardware.wifi-V1.0-java-constants",
+     ],
     apex_available: ["//apex_available:platform"],
 }
 
@@ -604,6 +606,7 @@ gensrcs {
 filegroup {
     name: "framework-annotations",
     srcs: [
+        "core/java/android/annotation/CallbackExecutor.java",
         "core/java/android/annotation/CheckResult.java",
         "core/java/android/annotation/IntDef.java",
         "core/java/android/annotation/IntRange.java",
@@ -611,7 +614,9 @@ filegroup {
         "core/java/android/annotation/Nullable.java",
         "core/java/android/annotation/RequiresPermission.java",
         "core/java/android/annotation/SdkConstant.java",
+        "core/java/android/annotation/StringDef.java",
         "core/java/android/annotation/SystemApi.java",
+        "core/java/android/annotation/SystemService.java",
         "core/java/android/annotation/TestApi.java",
         "core/java/android/annotation/UnsupportedAppUsage.java",
         "core/java/com/android/internal/annotations/GuardedBy.java",
@@ -1158,10 +1163,13 @@ java_library {
     srcs: [
         "core/java/android/content/pm/BaseParceledListSlice.java",
         "core/java/android/content/pm/ParceledListSlice.java",
+        "core/java/android/net/shared/Inet4AddressUtils.java",
+        "core/java/android/os/HandlerExecutor.java",
         "core/java/com/android/internal/util/AsyncChannel.java",
         "core/java/com/android/internal/util/AsyncService.java",
         "core/java/com/android/internal/util/Protocol.java",
         "core/java/com/android/internal/util/Preconditions.java",
+        "telephony/java/android/telephony/Annotation.java",
     ],
     libs: [
         "framework-annotations-lib",
@@ -1177,7 +1185,6 @@ filegroup {
     srcs: [
         "core/java/android/net/InterfaceConfiguration.java",
         "core/java/android/os/BasicShellCommandHandler.java",
-        "core/java/android/os/HandlerExecutor.java",
         "core/java/android/util/BackupUtils.java",
         "core/java/android/util/LocalLog.java",
         "core/java/android/util/Rational.java",
diff --git a/wifi/Android.bp b/wifi/Android.bp
index a69803a435e2..6326f14bc6fd 100644
--- a/wifi/Android.bp
+++ b/wifi/Android.bp
@@ -60,11 +60,14 @@ java_library {
     sdk_version: "core_platform",
     static_libs: [
         "framework-wifi-util-lib",
+        "android.hardware.wifi-V1.0-java-constants",
     ],
     libs: [
         // TODO(b/140299412) should be framework-system-stubs once we fix all @hide dependencies
         "framework-minus-apex",
-        "unsupportedappusage",
+        "framework-annotations-lib",
+        "unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage
+        "unsupportedappusage-annotation", // for dalvik.annotation.compat.UnsupportedAppUsage
     ],
     srcs: [
         ":framework-wifi-updatable-sources",
diff --git a/wifi/jarjar-rules.txt b/wifi/jarjar-rules.txt
index f0da1ec54080..0746d62d5115 100644
--- a/wifi/jarjar-rules.txt
+++ b/wifi/jarjar-rules.txt
@@ -18,7 +18,6 @@ rule android.util.LocalLog* com.android.server.x.wifi.util.LocalLog@1
 rule android.util.Rational* com.android.server.x.wifi.util.Rational@1
 
 rule android.os.BasicShellCommandHandler* com.android.server.x.wifi.os.BasicShellCommandHandler@1
-rule android.os.HandlerExecutor* com.android.server.x.wifi.os.HandlerExecutor@1
 
 # Use our statically linked bouncy castle library
 rule org.bouncycastle.** com.android.server.x.wifi.bouncycastle.@1
@@ -31,6 +30,9 @@ rule android.sysprop.** com.android.server.x.wifi.sysprop.@1
 # used by both framework-wifi and wifi-service
 rule android.content.pm.BaseParceledListSlice* android.x.net.wifi.util.BaseParceledListSlice@1
 rule android.content.pm.ParceledListSlice* android.x.net.wifi.util.ParceledListSlice@1
+rule android.net.shared.Inet4AddressUtils* android.x.net.wifi.util.Inet4AddressUtils@1
+rule android.os.HandlerExecutor* android.x.net.wifi.util.HandlerExecutor@1
+rule android.telephony.Annotation* android.x.net.wifi.util.TelephonyAnnotation@1
 rule com.android.internal.util.AsyncChannel* android.x.net.wifi.util.AsyncChannel@1
 rule com.android.internal.util.AsyncService* android.x.net.wifi.util.AsyncService@1
 rule com.android.internal.util.Preconditions* android.x.net.wifi.util.Preconditions@1