diff options
| -rw-r--r-- | artd/Android.bp | 2 | ||||
| -rw-r--r-- | dexopt_chroot_setup/Android.bp | 6 | ||||
| -rw-r--r-- | libartbase/Android.bp | 2 | ||||
| -rw-r--r-- | libartservice/service/Android.bp | 4 | ||||
| -rw-r--r-- | libarttools/Android.bp | 4 |
5 files changed, 6 insertions, 12 deletions
diff --git a/artd/Android.bp b/artd/Android.bp index a2b256a019..e1768c8868 100644 --- a/artd/Android.bp +++ b/artd/Android.bp @@ -57,7 +57,7 @@ art_cc_binary { "libart", "libartbase", "libartservice", - "libarttools", // Contains "libc++fs". + "libarttools", "libbase", "libdexfile", ], diff --git a/dexopt_chroot_setup/Android.bp b/dexopt_chroot_setup/Android.bp index 23ba4beede..eb511f99d8 100644 --- a/dexopt_chroot_setup/Android.bp +++ b/dexopt_chroot_setup/Android.bp @@ -50,7 +50,7 @@ art_cc_binary { shared_libs: [ "libart", "libartbase", - "libarttools", // Contains "libc++fs". + "libarttools", "libbase", ], apex_available: [ @@ -76,7 +76,7 @@ art_cc_test { ":art-gtest-jars-Main", ], static_libs: [ - "libarttools", // Contains "libc++fs". + "libarttools", "libbase", "libgmock", "libselinux", @@ -95,7 +95,7 @@ cc_fuzz { "libart", "libartbase", "liblog", - "libarttools", // Contains "libc++fs". + "libarttools", ], fuzz_config: { cc: [ diff --git a/libartbase/Android.bp b/libartbase/Android.bp index 40701fe357..16c8625061 100644 --- a/libartbase/Android.bp +++ b/libartbase/Android.bp @@ -261,13 +261,11 @@ art_cc_defaults { ], static: { whole_static_libs: [ - "libc++fs", "libcap", ], }, shared: { static_libs: [ - "libc++fs", "libcap", ], }, diff --git a/libartservice/service/Android.bp b/libartservice/service/Android.bp index 0b1bd90c20..8204d14672 100644 --- a/libartservice/service/Android.bp +++ b/libartservice/service/Android.bp @@ -47,7 +47,7 @@ cc_library { shared_libs: [ "libart", "libartbase", - "libarttools", // Contains "libc++fs". + "libarttools", "libbase", ], } @@ -65,7 +65,7 @@ cc_library { shared_libs: [ "libartd", "libartbased", - "libarttools", // Contains "libc++fs". + "libarttools", "libbase", ], } diff --git a/libarttools/Android.bp b/libarttools/Android.bp index 1f51fd7325..1fd1321b01 100644 --- a/libarttools/Android.bp +++ b/libarttools/Android.bp @@ -47,10 +47,6 @@ cc_library { export_static_lib_headers: [ "libfstab", ], - whole_static_libs: [ - // TODO(b/270049598): Investigate the cost of libc++fs compared to its utility. - "libc++fs", - ], apex_available: [ "com.android.art", "com.android.art.debug", |