Move the libnetworkstacktestsjni target to its own directory.

am: 6a84293151

Change-Id: Ia7adea67b570fd40e25d806a353e63882fc79435

2 files changed, 41 insertions, 27 deletions

diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index 580659e..9c1c791 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -84,30 +84,3 @@ java_defaults {
         "netd_aidl_interface-V2-cpp",
     ],
 }
-
-// JNI code for ApfTest
-cc_library_shared {
-    name: "libnetworkstacktestsjni",
-    srcs: [
-        "jni/**/*.cpp"
-    ],
-    cflags: [
-        "-Wall",
-        "-Wextra",
-        "-Werror",
-    ],
-    include_dirs: [
-        "hardware/google/apf",
-    ],
-    shared_libs: [
-        "libbinder",
-        "liblog",
-        "libcutils",
-        "libnativehelper",
-        "netd_aidl_interface-V2-cpp",
-    ],
-    static_libs: [
-        "libapf",
-        "libpcap",
-    ],
-}
diff --git a/tests/unit/jni/Android.bp b/tests/unit/jni/Android.bp
new file mode 100644
index 0000000..9520520
--- /dev/null
+++ b/tests/unit/jni/Android.bp
@@ -0,0 +1,41 @@
+//
+// Copyright (C) 2019 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.
+//
+
+cc_library_shared {
+    name: "libnetworkstacktestsjni",
+    srcs: [
+        "**/*.cpp"
+    ],
+    cflags: [
+        "-Wall",
+        "-Wextra",
+        "-Werror",
+    ],
+    include_dirs: [
+        "hardware/google/apf",
+    ],
+    shared_libs: [
+        "libbinder",
+        "liblog",
+        "libcutils",
+        "libnativehelper",
+        "netd_aidl_interface-V2-cpp",
+    ],
+    static_libs: [
+        "libapf",
+        "libpcap",
+    ],
+}