Add "libc++fs" as whole_static_libs of "libarttools".
This change addresses ODR violations introduced by
commit 2061ae2d4558acd8b79256f16f7a8d79a5d396e1.
Size before:
libarttools.so 94280
artd 286000
art_exec 74800
odrefresh 359888
Total ART APEX (uncompressed): 60801024
Size after:
libarttools.so 94280
artd 214888
art_exec 58664
odrefresh 338984
Total ART APEX (uncompressed): 60698624
Bug: 270015007
Test: atest art_standalone_libarttools_tests
Test: atest art_standalone_artd_tests
Test: atest art_standalone_odrefresh_tests
Test: DIST_DIR=/tmp/dist TARGET_PRODUCT=armv8 TARGET_BUILD_VARIANT=eng \
./art/test/testrunner/run_build_test_target.py -j80 art-gtest-asan32
Merged-In: I020cd0b4d2847d62ad13386da8579b03d3888e12
(partially cherry picked from commit 46f29122ce31614f458fc76e6513d6a4c6b622a5)
Change-Id: I8b9e17785589e75a1cea3241b9641b1ae1388711
diff --git a/artd/Android.bp b/artd/Android.bp
index c0ffd0a..af04302 100644
--- a/artd/Android.bp
+++ b/artd/Android.bp
@@ -29,7 +29,7 @@
"artd.cc",
],
shared_libs: [
- "libarttools",
+ "libarttools", // Contains "libc++fs".
"libbase",
"libbinder_ndk",
],
diff --git a/libarttools/Android.bp b/libarttools/Android.bp
index 3df40a5..e501e3c 100644
--- a/libarttools/Android.bp
+++ b/libarttools/Android.bp
@@ -43,6 +43,9 @@
shared_libs: [
"libbase",
],
+ whole_static_libs: [
+ "libc++fs",
+ ],
export_shared_lib_headers: ["libbase"],
}
diff --git a/odrefresh/Android.bp b/odrefresh/Android.bp
index 9b08940..3e8cf30 100644
--- a/odrefresh/Android.bp
+++ b/odrefresh/Android.bp
@@ -42,11 +42,11 @@
],
shared_libs: [
"libartpalette",
+ "libarttools", // Contains "libc++fs".
"libbase",
"liblog",
],
static_libs: [
- "libc++fs",
"libmodules-utils-build",
],
tidy: true,