Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1

Bug: 202323961
Merged-In: Ib3442e1d1e329876a7cfcdcae05f3ff6547a0c5a
Change-Id: I277817eba680bbce2c0a2658fb2b7307f8d70731

1 files changed, 10 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 16b274c..d612612 100644
--- a/Android.bp
+++ b/Android.bp
@@ -28,6 +28,7 @@ java_library {
     name: "libnanohttpd",
     srcs: ["core/src/main/**/*.java"],
     sdk_version: "current",
+    min_sdk_version: "30",
 }
 
 // This module target includes SimpleWebServer that supports additional functionality
@@ -41,3 +42,12 @@ java_library {
     ],
     sdk_version: "current",
 }
+
+java_library {
+    name: "nanohttpd-websocket",
+    srcs: [
+        "core/src/main/**/*.java",
+        "websocket/src/main/**/*.java",
+    ],
+    sdk_version: "current",
+}