Merge "Stop using group_static_libs property" am: bc8a6d063b am: e29dc9dfe1 am: 452a9dfcd4 am: e44cc3552f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1814336 Change-Id: I7e181af4627d0e0afaab6a3a6ea6222effae044f
2021-08-31 19:03:37 +00:00
parent 5ae07b441f e44cc3552f
commit b5cb84839c
3 changed files with 0 additions and 3 deletions
--- a/tools/aapt/Android.bp
+++ b/tools/aapt/Android.bp
@@ -50,7 +50,6 @@ cc_defaults {
        "libbase",
        "libz",
    ],
-    group_static_libs: true,

    cflags: [
        "-Wall",
--- a/tools/aapt2/Android.bp
+++ b/tools/aapt2/Android.bp
@@ -72,7 +72,6 @@ cc_defaults {
        "libidmap2_policies",
    ],
    stl: "libc++_static",
-    group_static_libs: true,
 }

 // ==========================================================
--- a/tools/split-select/Android.bp
+++ b/tools/split-select/Android.bp
@@ -48,7 +48,6 @@ cc_defaults {
        "libbase",
        "libz",
    ],
-    group_static_libs: true,

    target: {
        windows: {