Reorganize captiveportal-lib files

The files were not in folders matching their package names. Also moved
build rule to its own Android.bp.

Test: m
Change-Id: I82d058151ed5a4a5be81ec32cc905a66305b2bc2

4 files changed, 24 insertions, 9 deletions

diff --git a/Android.bp b/Android.bp
index ba2e424..2aa0c80 100644
--- a/Android.bp
+++ b/Android.bp
@@ -34,15 +34,6 @@
 //           NetworkStackApiStable          NetworkStack, InProcessNetworkStack, <-- output APKs
 //                                                    TestNetworkStack
 
-java_library {
-    name: "captiveportal-lib",
-    srcs: ["common/**/*.java"],
-    libs: [
-        "androidx.annotation_annotation",
-    ],
-    sdk_version: "system_current",
-}
-
 // Common defaults to define SDK level
 java_defaults {
     name: "NetworkStackApiCurrentLevel",
diff --git a/common/captiveportal/Android.bp b/common/captiveportal/Android.bp
new file mode 100644
index 0000000..d34ab85
--- /dev/null
+++ b/common/captiveportal/Android.bp
@@ -0,0 +1,24 @@
+//
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+java_library {
+    name: "captiveportal-lib",
+    srcs: ["src/**/*.java"],
+    libs: [
+        "androidx.annotation_annotation",
+    ],
+    sdk_version: "system_current",
+}
\ No newline at end of file
diff --git a/common/CaptivePortalProbeResult.java b/common/captiveportal/src/android/net/captiveportal/CaptivePortalProbeResult.java
index 48cd48b..48cd48b 100644
--- a/common/CaptivePortalProbeResult.java
+++ b/common/captiveportal/src/android/net/captiveportal/CaptivePortalProbeResult.java
diff --git a/common/CaptivePortalProbeSpec.java b/common/captiveportal/src/android/net/captiveportal/CaptivePortalProbeSpec.java
index bf983a5..bf983a5 100644
--- a/common/CaptivePortalProbeSpec.java
+++ b/common/captiveportal/src/android/net/captiveportal/CaptivePortalProbeSpec.java