diff options
| author | Colin Cross <ccross@android.com> | 2022-01-13 13:45:32 -0800 |
|---|---|---|
| committer | Treehugger Robot <treehugger-gerrit@google.com> | 2022-02-02 03:11:13 +0000 |
| commit | 7e6a2645d0f924fe9df6a51140614a792c8dc6d9 (patch) | |
| tree | a3e73a378a40ce7ffc9716fb448ac8489220d4f1 | |
| parent | 06adc1e4b3de7238f89d693fb3b0357f8b061701 (diff) | |
| download | libchrome-7e6a2645d0f924fe9df6a51140614a792c8dc6d9.tar.gz | |
Separate glibc and musl sources
Building base/allocator/allocator_shim_default_dispatch_to_glibc.cc
fails when building against musl libc, use a separate list of
sources for glibc and musl.
Bug: 190084016
Test: m USE_HOST_MUSL=true host-native
Change-Id: I32c1507ce9658b0e7e4ba5fed1ade87a4ec1ca92
| -rw-r--r-- | Android.bp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp index cf8ac351ed..83d20cc6ba 100644 --- a/Android.bp +++ b/Android.bp @@ -774,7 +774,13 @@ libchromeLinuxSrc = [ "base/threading/platform_thread_linux.cc", ] -libchromeLinuxGlibcSrc = [ +libchromeMuslSrc = [ + "base/debug/stack_trace_posix.cc", + "base/memory/platform_shared_memory_region_posix.cc", + "base/memory/shared_memory_handle_posix.cc", +] + +libchromeGlibcSrc = [ "base/allocator/allocator_shim.cc", "base/allocator/allocator_shim_default_dispatch_to_glibc.cc", "base/debug/stack_trace_posix.cc", @@ -850,8 +856,11 @@ cc_library { "liblog", ], }, - linux_glibc: { - srcs: libchromeLinuxGlibcSrc, + glibc: { + srcs: libchromeGlibcSrc, + }, + musl: { + srcs: libchromeMuslSrc, }, android: { srcs: libchromeAndroidSrc, |