Rename libdexfile_external_static to libdexfile_static (reland).
This relands https://r.android.com/1643426 after fixing the build issue
in b/184239856.
Test: m nothing
Bug: 143978909
Change-Id: Iaa6a90f413c28025758fa21f86bf2c857b1e68bf
diff --git a/simpleperf/Android.bp b/simpleperf/Android.bp
index e76fd82..9dfef2e 100644
--- a/simpleperf/Android.bp
+++ b/simpleperf/Android.bp
@@ -284,7 +284,7 @@
target: {
linux: {
- // See note for libdexfile_external_static in simpleperf_ndk.
+ // See note for libdexfile_static in simpleperf_ndk.
static_libs: ["libdexfile_support"],
},
},
@@ -393,12 +393,11 @@
},
},
linux: {
- // In the NDK we need libdexfile_external_static which links
- // libdexfile_external and its ART dependencies statically. However
- // in other libraries we must use libdexfile_support, which dlopen's
- // libdexfile_external.so from the ART APEX, to avoid getting ART
- // internals in the system image.
- static_libs: ["libdexfile_external_static"],
+ // In the NDK we need libdexfile_static which links libdexfile and
+ // its ART dependencies statically. However in other libraries we
+ // must use libdexfile_support, which dlopen's libdexfile.so from
+ // the ART APEX, to avoid getting ART internals in the system image.
+ static_libs: ["libdexfile_static"],
},
linux_glibc_x86: {
dist: {
@@ -445,8 +444,8 @@
enabled: false,
},
linux: {
- // See note for libdexfile_support_static in simpleperf_ndk.
- static_libs: ["libdexfile_external_static"],
+ // See note for libdexfile_static in simpleperf_ndk.
+ static_libs: ["libdexfile_static"],
},
},
}
@@ -471,8 +470,8 @@
},
linux: {
ldflags: ["-Wl,--exclude-libs,ALL"],
- // See note for libdexfile_support_static in simpleperf_ndk.
- static_libs: ["libdexfile_external_static"],
+ // See note for libdexfile_static in simpleperf_ndk.
+ static_libs: ["libdexfile_static"],
},
darwin: {
dist: {
