commit 369c920552d28b3ac759035f89af06f83b9db684
author David Su <dysu@google.com> Thu Jan 09 18:09:56 2020 -0800
committer David Su <dysu@google.com> Sun Jan 12 18:34:53 2020 -0800
tree 32dc6a97923cc566a19c20af3ae63c92da00c057
parent 511a814a109169383f6aecad2ba86e4e5c770345

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

diff --git a/Android.bp b/Android.bp
index 9a0bd73..40af203 100644
--- a/Android.bp
+++ b/Android.bp
@@ -348,7 +348,6 @@
         "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 @@
     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 @@
 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 @@
         "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 @@
     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 @@
     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",