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

gn2bp: sort target entries

Browse Source 
Test: //components/cronet/android:cronet
Change-Id: I31a945db243a9704e678e8093f86267666b8e5e3
This commit is contained in:
Patrick Rohr
2022-11-16 15:20:03 -08:00
parent 3b5ff76e4a
commit 09ee70e82c
2 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -995,30 +995,6 @@ cc_library_static {
"liblog",
],
},
host: {
srcs: [
"base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_glibc.cc",
"base/allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h",
"base/allocator/partition_allocator/shim/allocator_shim_override_libc_symbols.h",
"base/base_paths_posix.cc",
"base/debug/stack_trace_posix.cc",
"base/files/dir_reader_linux.h",
"base/files/file_util_linux.cc",
"base/files/scoped_file_linux.cc",
"base/memory/platform_shared_memory_mapper_posix.cc",
"base/memory/platform_shared_memory_region_posix.cc",
"base/nix/mime_util_xdg.cc",
"base/nix/mime_util_xdg.h",
"base/nix/xdg_util.cc",
"base/nix/xdg_util.h",
"base/power_monitor/power_monitor_device_source_stub.cc",
"base/process/process_linux.cc",
"base/profiler/stack_sampler_posix.cc",
"base/stack_canary_linux.cc",
"base/stack_canary_linux.h",
"base/threading/platform_thread_linux.cc",
],
},
android_x86_64: {
srcs: [
"base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc",
@@ -1146,6 +1122,30 @@ cc_library_static {
"base/time/time_android.cc",
],
},
host: {
srcs: [
"base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_glibc.cc",
"base/allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h",
"base/allocator/partition_allocator/shim/allocator_shim_override_libc_symbols.h",
"base/base_paths_posix.cc",
"base/debug/stack_trace_posix.cc",
"base/files/dir_reader_linux.h",
"base/files/file_util_linux.cc",
"base/files/scoped_file_linux.cc",
"base/memory/platform_shared_memory_mapper_posix.cc",
"base/memory/platform_shared_memory_region_posix.cc",
"base/nix/mime_util_xdg.cc",
"base/nix/mime_util_xdg.h",
"base/nix/xdg_util.cc",
"base/nix/xdg_util.h",
"base/power_monitor/power_monitor_device_source_stub.cc",
"base/process/process_linux.cc",
"base/profiler/stack_sampler_posix.cc",
"base/stack_canary_linux.cc",
"base/stack_canary_linux.h",
"base/threading/platform_thread_linux.cc",
],
},
},
}
@@ -2154,16 +2154,16 @@ filegroup {
"buildtools/third_party/libc++abi/trunk/src/stdlib_typeinfo.cpp",
],
target: {
host: {
srcs: [
"buildtools/third_party/libc++abi/trunk/src/cxa_demangle.cpp",
],
},
android_x86_64: {
srcs: [
"buildtools/third_party/libc++abi/cxa_demangle_stub.cc",
],
},
host: {
srcs: [
"buildtools/third_party/libc++abi/trunk/src/cxa_demangle.cpp",
],
},
},
}
@@ -6728,18 +6728,18 @@ cc_library_static {
],
cpp_std: "c++20",
target: {
host: {
srcs: [
"third_party/libevent/linux/config.h",
"third_party/libevent/linux/event-config.h",
],
},
android_x86_64: {
srcs: [
"third_party/libevent/android/config.h",
"third_party/libevent/android/event-config.h",
],
},
host: {
srcs: [
"third_party/libevent/linux/config.h",
"third_party/libevent/linux/event-config.h",
],
},
},
}

2
tools/gn2bp/gen_android_bp
View File

@@ -343,7 +343,7 @@ class Module(object):
self._output_field(output, 'arch')
target_out = []
for arch, target in self.target.items():
for arch, target in sorted(self.target.items()):
# _output_field calls getattr(self, arch).
setattr(self, arch, target)
self._output_field(target_out, arch)