diff options
| -rw-r--r-- | tools/aapt/Android.bp | 1 | ||||
| -rw-r--r-- | tools/aapt2/Android.bp | 7 | ||||
| -rw-r--r-- | 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 c75ba71c4432..cf5f31353345 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 5c5b3c32876c..5de0a63455a5 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 c12fc6a7f253..540265793de6 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: { |