From d010fb142deb52a195b06c0835c3333c5069400d Mon Sep 17 00:00:00 2001
From: LaMont Jones <lamontjones@google.com>
Date: Mon, 30 Aug 2021 23:20:05 +0000
Subject: [PATCH] Stop using `group_static_libs` property

This property is now ignored, so there is no need to set it.
For more details, see the bug and/or "Effecient archive file handling"
in https://lld.llvm.org/NewLLD.html#key-concepts

Bug: 189475744
Test: Manual build succeeds
Change-Id: I79ff6aaba47fb13548d735b291da0796d416be48
---
 tools/aapt/Android.bp         | 1 -
 tools/aapt2/Android.bp        | 7 +++----
 tools/split-select/Android.bp | 1 -
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/tools/aapt/Android.bp b/tools/aapt/Android.bp
index c75ba71c44328..cf5f313533454 100644
--- a/tools/aapt/Android.bp
+++ b/tools/aapt/Android.bp
@@ -50,7 +50,6 @@ cc_defaults {
         "libbase",
         "libz",
     ],
-    group_static_libs: true,
 
     cflags: [
         "-Wall",
diff --git a/tools/aapt2/Android.bp b/tools/aapt2/Android.bp
index 5c5b3c32876c2..5de0a63455a5b 100644
--- 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,
 }
 
 // ==========================================================
@@ -196,9 +195,9 @@ cc_test_host {
     ],
     defaults: ["aapt2_defaults"],
     data: [
-         "integration-tests/CompileTest/**/*",
-         "integration-tests/CommandTests/**/*",
-         "integration-tests/ConvertTest/**/*"
+        "integration-tests/CompileTest/**/*",
+        "integration-tests/CommandTests/**/*",
+        "integration-tests/ConvertTest/**/*",
     ],
 }
 
diff --git a/tools/split-select/Android.bp b/tools/split-select/Android.bp
index c12fc6a7f2539..540265793de6c 100644
--- 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: {