Reorganize IPsec SDK prebuilts.

Use the same organization as other prebuilts/module_sdk projects to
ensure that the prebuilt dropper tool updates these existing ones,
rather than created new conflicting ones alongside them.

Bug: 188427719
Test: TH
Change-Id: I25db0717e23797a1e342ad52980872d39518030b

14 files changed, 37 insertions, 37 deletions

diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index 6909b5b..0000000
--- a/Android.bp
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-java_sdk_library_import {
-    name: "android.net.ipsec.ike",
-    owner: "google",
-    prefer: false,
-    shared_library: true,
-    apex_available: [
-        "com.android.ipsec",
-        "test_com.android.ipsec",
-    ],
-    public: {
-        jars: ["current/public/android.net.ipsec.ike.jar"],
-        stub_srcs: ["current/public/android.net.ipsec.ike.srcjar"],
-        current_api: "current/public/android.net.ipsec.ike.txt",
-        removed_api: "current/public/android.net.ipsec.ike-removed.txt",
-        sdk_version: "module_current",
-    },
-    system: {
-        jars: ["current/system/android.net.ipsec.ike.jar"],
-        stub_srcs: ["current/system/android.net.ipsec.ike.srcjar"],
-        current_api: "current/system/android.net.ipsec.ike.txt",
-        removed_api: "current/system/android.net.ipsec.ike-removed.txt",
-        sdk_version: "module_current",
-    },
-    module_lib: {
-        jars: ["current/module_lib/android.net.ipsec.ike.jar"],
-        stub_srcs: ["current/module_lib/android.net.ipsec.ike.srcjar"],
-        current_api: "current/module_lib/android.net.ipsec.ike.txt",
-        removed_api: "current/module_lib/android.net.ipsec.ike-removed.txt",
-        sdk_version: "module_current",
-    },
-}
diff --git a/current/Android.bp b/current/Android.bp
new file mode 100644
index 0000000..b20be47
--- /dev/null
+++ b/current/Android.bp
@@ -0,0 +1,37 @@
+
+
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+java_sdk_library_import {
+    name: "android.net.ipsec.ike",
+    owner: "google",
+    prefer: false,
+    shared_library: true,
+    apex_available: [
+        "com.android.ipsec",
+        "test_com.android.ipsec",
+    ],
+    public: {
+        jars: ["sdk_library/public/android.net.ipsec.ike.jar"],
+        stub_srcs: ["sdk_library/public/android.net.ipsec.ike.srcjar"],
+        current_api: "sdk_library/public/android.net.ipsec.ike.txt",
+        removed_api: "sdk_library/public/android.net.ipsec.ike-removed.txt",
+        sdk_version: "module_current",
+    },
+    system: {
+        jars: ["sdk_library/system/android.net.ipsec.ike.jar"],
+        stub_srcs: ["sdk_library/system/android.net.ipsec.ike.srcjar"],
+        current_api: "sdk_library/system/android.net.ipsec.ike.txt",
+        removed_api: "sdk_library/system/android.net.ipsec.ike-removed.txt",
+        sdk_version: "module_current",
+    },
+    module_lib: {
+        jars: ["sdk_library/module_lib/android.net.ipsec.ike.jar"],
+        stub_srcs: ["sdk_library/module_lib/android.net.ipsec.ike.srcjar"],
+        current_api: "sdk_library/module_lib/android.net.ipsec.ike.txt",
+        removed_api: "sdk_library/module_lib/android.net.ipsec.ike-removed.txt",
+        sdk_version: "module_current",
+    },
+}
diff --git a/current/module_lib/android.net.ipsec.ike-removed.txt b/current/sdk_library/module_lib/android.net.ipsec.ike-removed.txt
index d802177..d802177 100644
--- a/current/module_lib/android.net.ipsec.ike-removed.txt
+++ b/current/sdk_library/module_lib/android.net.ipsec.ike-removed.txt
diff --git a/current/module_lib/android.net.ipsec.ike.jar b/current/sdk_library/module_lib/android.net.ipsec.ike.jar
index 2ef9e96..2ef9e96 100644
--- a/current/module_lib/android.net.ipsec.ike.jar
+++ b/current/sdk_library/module_lib/android.net.ipsec.ike.jar
diff --git a/current/module_lib/android.net.ipsec.ike.srcjar b/current/sdk_library/module_lib/android.net.ipsec.ike.srcjar
index f1cf4a6..f1cf4a6 100644
--- a/current/module_lib/android.net.ipsec.ike.srcjar
+++ b/current/sdk_library/module_lib/android.net.ipsec.ike.srcjar
diff --git a/current/module_lib/android.net.ipsec.ike.txt b/current/sdk_library/module_lib/android.net.ipsec.ike.txt
index d802177..d802177 100644
--- a/current/module_lib/android.net.ipsec.ike.txt
+++ b/current/sdk_library/module_lib/android.net.ipsec.ike.txt
diff --git a/current/public/android.net.ipsec.ike-removed.txt b/current/sdk_library/public/android.net.ipsec.ike-removed.txt
index d802177..d802177 100644
--- a/current/public/android.net.ipsec.ike-removed.txt
+++ b/current/sdk_library/public/android.net.ipsec.ike-removed.txt
diff --git a/current/public/android.net.ipsec.ike.jar b/current/sdk_library/public/android.net.ipsec.ike.jar
index e817843..e817843 100644
--- a/current/public/android.net.ipsec.ike.jar
+++ b/current/sdk_library/public/android.net.ipsec.ike.jar
diff --git a/current/public/android.net.ipsec.ike.srcjar b/current/sdk_library/public/android.net.ipsec.ike.srcjar
index a9fed69..a9fed69 100644
--- a/current/public/android.net.ipsec.ike.srcjar
+++ b/current/sdk_library/public/android.net.ipsec.ike.srcjar
diff --git a/current/public/android.net.ipsec.ike.txt b/current/sdk_library/public/android.net.ipsec.ike.txt
index d802177..d802177 100644
--- a/current/public/android.net.ipsec.ike.txt
+++ b/current/sdk_library/public/android.net.ipsec.ike.txt
diff --git a/current/system/android.net.ipsec.ike-removed.txt b/current/sdk_library/system/android.net.ipsec.ike-removed.txt
index d802177..d802177 100644
--- a/current/system/android.net.ipsec.ike-removed.txt
+++ b/current/sdk_library/system/android.net.ipsec.ike-removed.txt
diff --git a/current/system/android.net.ipsec.ike.jar b/current/sdk_library/system/android.net.ipsec.ike.jar
index 2ef9e96..2ef9e96 100644
--- a/current/system/android.net.ipsec.ike.jar
+++ b/current/sdk_library/system/android.net.ipsec.ike.jar
diff --git a/current/system/android.net.ipsec.ike.srcjar b/current/sdk_library/system/android.net.ipsec.ike.srcjar
index f1cf4a6..f1cf4a6 100644
--- a/current/system/android.net.ipsec.ike.srcjar
+++ b/current/sdk_library/system/android.net.ipsec.ike.srcjar
diff --git a/current/system/android.net.ipsec.ike.txt b/current/sdk_library/system/android.net.ipsec.ike.txt
index d42f8c0..d42f8c0 100644
--- a/current/system/android.net.ipsec.ike.txt
+++ b/current/sdk_library/system/android.net.ipsec.ike.txt