From be906bbfc5fbdfc1168844cb410adbb355b23385 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Wed, 9 May 2018 16:26:42 -0700
Subject: Convert system/extras/tests to Soong

See build/soong/README.md for more information.

Some modules are no longer installed by default on eng/debug builds, but
I didn't see any automatic references to them. If they're commonly used
by users, they can be added into build/make with PRODUCT_PACKAGES_ENG /
PRODUCT_PACKAGES_DEBUG. Otherwise everyone's compiles get a little
smaller.

Some modules also moved from /system/xbin to /system/bin, as we've
deprecated xbin. I checked codesearch for references to the full paths
and couldn't find any.

Test: cd system/extras/tests; mma
Test: for the modules changing locations, check cs/ for references
Change-Id: Ia91f12051519814a8d45d5af4a7f7700ffee288f
---
 tests/iptables/qtaguid/Android.bp | 32 ++++++++++++++++++++++++++++++++
 tests/iptables/qtaguid/Android.mk | 28 ----------------------------
 2 files changed, 32 insertions(+), 28 deletions(-)
 create mode 100644 tests/iptables/qtaguid/Android.bp
 delete mode 100644 tests/iptables/qtaguid/Android.mk

(limited to 'tests/iptables/qtaguid')

diff --git a/tests/iptables/qtaguid/Android.bp b/tests/iptables/qtaguid/Android.bp
new file mode 100644
index 00000000..9c853c8b
--- /dev/null
+++ b/tests/iptables/qtaguid/Android.bp
@@ -0,0 +1,32 @@
+//
+// Copyright (C) 2011 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_test {
+    name: "socketTag",
+    srcs: ["socketTag.cpp"],
+    shared_libs: [
+        "libcutils",
+        "libutils",
+        "liblog",
+        "libbase",
+    ],
+    static_libs: ["libtestUtil"],
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-fno-strict-aliasing",
+    ],
+}
diff --git a/tests/iptables/qtaguid/Android.mk b/tests/iptables/qtaguid/Android.mk
deleted file mode 100644
index bc09bdd8..00000000
--- a/tests/iptables/qtaguid/Android.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (C) 2011 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := socketTag
-LOCAL_SRC_FILES := socketTag.cpp
-LOCAL_SHARED_LIBRARIES += libcutils libutils liblog libbase
-LOCAL_STATIC_LIBRARIES += libtestUtil
-LOCAL_C_INCLUDES += system/extras/tests/include
-LOCAL_CFLAGS += -Wall -Werror -fno-strict-aliasing
-
-include $(BUILD_NATIVE_TEST)
-- 
cgit v1.2.3