diff options
| author | Ulyana Trafimovich <skvadrik@google.com> | 2021-04-09 15:24:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-04-09 15:24:59 +0000 |
| commit | c52d8de29d8cb0a1e1a1fb41a88cb02d45946667 (patch) | |
| tree | f77664c77db681b8700abf1b2d365233c5cf5b19 /simpleperf | |
| parent | 6106d8cbddebaae5849fb818f434962acac2668d (diff) | |
| parent | 754562e71a528579e81dc53c4f11679fdd9e876a (diff) | |
| download | extras-c52d8de29d8cb0a1e1a1fb41a88cb02d45946667.tar.gz | |
Merge "Revert "Rename libdexfile_external_static to libdexfile_static (...""
Diffstat (limited to 'simpleperf')
| -rw-r--r-- | simpleperf/Android.bp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/simpleperf/Android.bp b/simpleperf/Android.bp index 9dfef2e2..e76fd82d 100644 --- a/simpleperf/Android.bp +++ b/simpleperf/Android.bp @@ -284,7 +284,7 @@ cc_library_static { target: { linux: { - // See note for libdexfile_static in simpleperf_ndk. + // See note for libdexfile_external_static in simpleperf_ndk. static_libs: ["libdexfile_support"], }, }, @@ -393,11 +393,12 @@ cc_binary { }, }, linux: { - // 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"], + // 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"], }, linux_glibc_x86: { dist: { @@ -444,8 +445,8 @@ cc_library { enabled: false, }, linux: { - // See note for libdexfile_static in simpleperf_ndk. - static_libs: ["libdexfile_static"], + // See note for libdexfile_support_static in simpleperf_ndk. + static_libs: ["libdexfile_external_static"], }, }, } @@ -470,8 +471,8 @@ cc_library_shared { }, linux: { ldflags: ["-Wl,--exclude-libs,ALL"], - // See note for libdexfile_static in simpleperf_ndk. - static_libs: ["libdexfile_static"], + // See note for libdexfile_support_static in simpleperf_ndk. + static_libs: ["libdexfile_external_static"], }, darwin: { dist: { |