LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "gn2bp: Turn off allocator_shims for musl only"

Browse Source
This commit is contained in:
Mohannad Farrag
2023-03-24 11:52:54 +00:00
committed by Gerrit Code Review
parent 8d4702a1f0 8c5b578a0d
commit 465805c6a8
2 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tools/gn2bp/Android.bp.swp
View File

@@ -995,7 +995,6 @@ cc_library_static {
"base/allocator/dispatcher/dispatcher.cc",
"base/allocator/dispatcher/internal/dispatch_data.cc",
"base/allocator/dispatcher/reentry_guard.cc",
"base/allocator/partition_allocator/shim/allocator_shim.cc",
"base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc",
"base/android/android_hardware_buffer_compat.cc",
"base/android/android_image_reader_compat.cc",
@@ -1567,6 +1566,11 @@ cc_library_static {
"-Wl,-wrap,vasprintf",
],
target: {
android: {
srcs: [
"base/allocator/partition_allocator/shim/allocator_shim.cc",
],
},
android_arm: {
srcs: [
"base/android/reached_code_profiler.cc",
@@ -1606,6 +1610,11 @@ cc_library_static {
"-msse3",
],
},
glibc: {
srcs: [
"base/allocator/partition_allocator/shim/allocator_shim.cc",
],
},
},
}
@@ -1666,7 +1675,6 @@ cc_library_static {
"base/allocator/dispatcher/dispatcher.cc",
"base/allocator/dispatcher/internal/dispatch_data.cc",
"base/allocator/dispatcher/reentry_guard.cc",
"base/allocator/partition_allocator/shim/allocator_shim.cc",
"base/at_exit.cc",
"base/barrier_closure.cc",
"base/base64.cc",
@@ -2135,6 +2143,9 @@ cc_library_static {
],
target: {
android: {
srcs: [
"base/allocator/partition_allocator/shim/allocator_shim.cc",
],
shared_libs: [
"libandroid",
"liblog",
@@ -2615,9 +2626,14 @@ cc_library_static {
"-Wl,-wrap,vasprintf",
],
},
glibc: {
srcs: [
"base/allocator/partition_allocator/shim/allocator_shim.cc",
"base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_glibc.cc",
],
},
host: {
srcs: [
"base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_glibc.cc",
"base/base_paths_posix.cc",
"base/debug/stack_trace_posix.cc",
"base/files/file_util_linux.cc",

25
tools/gn2bp/gen_android_bp
View File

@@ -451,6 +451,7 @@ class Module(object):
self.target['android_arm'] = Target('android_arm')
self.target['android_arm64'] = Target('android_arm64')
self.target['host'] = Target('host')
self.target['glibc'] = Target('glibc')
self.stl = None
self.cpp_std = None
self.dist = dict()
@@ -1760,6 +1761,28 @@ def update_jni_registration_module(module, gn):
for source in get_non_api_java_sources(gn)
if source.endswith('.java')])
def turn_off_allocator_shim_for_musl(module):
allocation_shim = "base/allocator/partition_allocator/shim/allocator_shim.cc"
allocator_shim_files = {
allocation_shim,
"base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_glibc.cc",
}
module.srcs -= allocator_shim_files
for arch in module.target.values():
arch.srcs -= allocator_shim_files
module.target['android'].srcs.add(allocation_shim)
if gn_utils.TESTING_SUFFIX in module.name:
# allocator_shim_default_dispatch_to_glibc is only added to the __testing version of base
# since base_base__testing is compiled for host. When compiling for host. Soong compiles
# using glibc or musl(experimental). We currently only support compiling for glibc.
module.target['glibc'].srcs.update(allocator_shim_files)
else:
# allocator_shim_default_dispatch_to_glibc does not exist in the prod version of base
# `base_base` since this only compiles for android and bionic is used. Bionic is the equivalent
# of glibc but for android.
module.target['glibc'].srcs.add(allocation_shim)
def create_blueprint_for_targets(gn, targets, test_targets):
"""Generate a blueprint for a list of GN targets."""
blueprint = Blueprint()
@@ -1823,6 +1846,8 @@ def create_blueprint_for_targets(gn, targets, test_targets):
for module in blueprint.modules.values():
if 'cronet_jni_registration' in module.name:
update_jni_registration_module(module, gn)
if module.name in ['cronet_aml_base_base', 'cronet_aml_base_base' + gn_utils.TESTING_SUFFIX]:
turn_off_allocator_shim_for_musl(module)
# Merge in additional hardcoded arguments.
for module in blueprint.modules.values():