Merge "Stop using group_static_libs property"

2021-08-31 17:54:09 +00:00
parent 93b4b55ee7 d010fb142d
commit bc8a6d063b
3 changed files with 3 additions and 6 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,
 }

 // ==========================================================
@@ -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/**/*",
    ],
 }

--- 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: {