diff options
author | 2021-08-31 18:07:45 +0000 | |
---|---|---|
committer | 2021-08-31 18:07:45 +0000 | |
commit | e29dc9dfe148b46d0b3f838aebb941f92bab59fe (patch) | |
tree | 522419a979aa21c47568d7782f7524771e56969b | |
parent | 872f7a88e54b1aa8c76c23099d6e78bdf82f8cdb (diff) | |
parent | bc8a6d063b22f56d1fb95c8c5efa0d483602148a (diff) |
Merge "Stop using `group_static_libs` property" am: bc8a6d063b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1814336
Change-Id: Iae29e06901daae4b6f8d7f972ba938e2a94a5311
-rw-r--r-- | tools/aapt/Android.bp | 1 | ||||
-rw-r--r-- | tools/aapt2/Android.bp | 1 | ||||
-rw-r--r-- | tools/split-select/Android.bp | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/tools/aapt/Android.bp b/tools/aapt/Android.bp index a19d183d617b..01eb4f69f842 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 12dc156f75be..740b44e0ce28 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, } // ========================================================== 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: { |