Merge "Remove obsolete subdirs and optional_subdirs"

2020-02-20 11:38:17 +00:00
parent c13747693f 7ede3dd2b3
commit 2b5484564a
5 changed files with 0 additions and 25 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -911,22 +911,6 @@ gensrcs {
    output_extension: "proto.h",
 }

-
-subdirs = [
-    "cmds/*",
-    "core/*",
-    "libs/*",
-    "media/*",
-    "proto",
-    "tools/*",
-    "native/android",
-    "native/graphics/jni",
-]
-
-optional_subdirs = [
-    "core/tests/utiltests/jni",
-]
-
 // TODO(b/77285514): remove this once the last few hidl interfaces have been
 // updated to use hwbinder.stubs.
 java_library {
--- a/libs/usb/Android.bp
+++ b/libs/usb/Android.bp
@@ -19,5 +19,3 @@ java_sdk_library {
    srcs: ["src/**/*.java"],
    api_packages: ["com.android.future.usb"],
 }
-
-subdirs = ["tests/*"]
--- a/libs/usb/tests/AccessoryChat/Android.bp
+++ b/libs/usb/tests/AccessoryChat/Android.bp
@@ -1,4 +1,3 @@
-subdirs = ["accessorychat"]
 //
 // Copyright (C) 2011 The Android Open Source Project
 //
--- a/media/jni/Android.bp
+++ b/media/jni/Android.bp
@@ -124,8 +124,3 @@ cc_library_shared {
        "-Wunreachable-code",
    ],
 }
-
-subdirs = [
-    "audioeffect",
-    "soundpool",
-]
--- a/media/native/Android.bp
+++ b/media/native/Android.bp
@@ -1 +0,0 @@
-subdirs = ["*"]