From e40e4270e8fc539abfb11ba238ca6b3f308f0ab7 Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Tue, 14 Jan 2020 12:18:40 -0800
Subject: [PATCH] remove deprecated bp 'subdirs'

noticed some, so thought I would remove them everywhere here

Bug: N/A
Test: N/A
Change-Id: I2978673b158d6c253914ea22f7f0129e446a5f91
---
 Android.bp                       | 2 --
 debuggerd/Android.bp             | 4 ----
 deprecated-adf/Android.bp        | 1 -
 deprecated-adf/libadf/Android.bp | 2 --
 libvndksupport/Android.bp        | 2 --
 property_service/Android.bp      | 1 -
 trusty/Android.bp                | 6 ------
 trusty/libtrusty/Android.bp      | 4 ----
 8 files changed, 22 deletions(-)
 delete mode 100644 deprecated-adf/Android.bp
 delete mode 100644 property_service/Android.bp
 delete mode 100644 trusty/Android.bp

diff --git a/Android.bp b/Android.bp
index c6f625110..0b4a9255c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,5 +2,3 @@ filegroup {
     name: "android_filesystem_config_header",
     srcs: ["include/private/android_filesystem_config.h"],
 }
-
-subdirs = ["*"]
diff --git a/debuggerd/Android.bp b/debuggerd/Android.bp
index 780e48d2f..c8df3e3c1 100644
--- a/debuggerd/Android.bp
+++ b/debuggerd/Android.bp
@@ -355,7 +355,3 @@ cc_binary {
 
     init_rc: ["tombstoned/tombstoned.rc"],
 }
-
-subdirs = [
-    "crasher",
-]
diff --git a/deprecated-adf/Android.bp b/deprecated-adf/Android.bp
deleted file mode 100644
index b44c29601..000000000
--- a/deprecated-adf/Android.bp
+++ /dev/null
@@ -1 +0,0 @@
-subdirs = ["*"]
diff --git a/deprecated-adf/libadf/Android.bp b/deprecated-adf/libadf/Android.bp
index 49e37215b..70f0a3ba0 100644
--- a/deprecated-adf/libadf/Android.bp
+++ b/deprecated-adf/libadf/Android.bp
@@ -24,5 +24,3 @@ cc_library {
     local_include_dirs: ["include"],
     export_include_dirs: ["include"],
 }
-
-subdirs = ["tests"]
diff --git a/libvndksupport/Android.bp b/libvndksupport/Android.bp
index f4544a14c..b92c76c9f 100644
--- a/libvndksupport/Android.bp
+++ b/libvndksupport/Android.bp
@@ -1,5 +1,3 @@
-subdirs = ["tests"]
-
 cc_library {
     name: "libvndksupport",
     native_bridge_supported: true,
diff --git a/property_service/Android.bp b/property_service/Android.bp
deleted file mode 100644
index b44c29601..000000000
--- a/property_service/Android.bp
+++ /dev/null
@@ -1 +0,0 @@
-subdirs = ["*"]
diff --git a/trusty/Android.bp b/trusty/Android.bp
deleted file mode 100644
index 2fb2e194b..000000000
--- a/trusty/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-subdirs = [
-    "gatekeeper",
-    "keymaster",
-    "libtrusty",
-    "storage/*",
-]
diff --git a/trusty/libtrusty/Android.bp b/trusty/libtrusty/Android.bp
index f6e9bee3d..8dba78d91 100644
--- a/trusty/libtrusty/Android.bp
+++ b/trusty/libtrusty/Android.bp
@@ -12,10 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-subdirs = [
-    "tipc-test",
-]
-
 cc_library {
     name: "libtrusty",
     vendor: true,