joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

gn2bp: Add missing linker flags

Browse source 
* Tests usually shim memory allocations for metrics purposes through linker flags.

Test: m
Change-Id: I2a3bbe648f155469721cf1df25439ca60afee6b5
This commit is contained in:
Mohannad Farrag 2023-01-16 16:02:32 +00:00
commit 875d83b140
2 changed files with 137 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

135
tools/gn2bp/Android.bp.swp
View file

@ -1036,6 +1036,21 @@ cc_library_static {
"-Wl,--as-needed",
"-Wl,--gc-sections",
"-Wl,--icf=all",
"-Wl,-wrap,asprintf",
"-Wl,-wrap,calloc",
"-Wl,-wrap,free",
"-Wl,-wrap,getcwd",
"-Wl,-wrap,malloc",
"-Wl,-wrap,malloc_usable_size",
"-Wl,-wrap,memalign",
"-Wl,-wrap,posix_memalign",
"-Wl,-wrap,pvalloc",
"-Wl,-wrap,realloc",
"-Wl,-wrap,realpath",
"-Wl,-wrap,strdup",
"-Wl,-wrap,strndup",
"-Wl,-wrap,valloc",
"-Wl,-wrap,vasprintf",
],
target: {
android_arm: {
@ -2723,6 +2738,21 @@ cc_library_shared {
"-Wl,--gc-sections",
"-Wl,--icf=all",
"-Wl,--script,external/cronet/base/android/library_loader/anchor_functions.lds",
"-Wl,-wrap,asprintf",
"-Wl,-wrap,calloc",
"-Wl,-wrap,free",
"-Wl,-wrap,getcwd",
"-Wl,-wrap,malloc",
"-Wl,-wrap,malloc_usable_size",
"-Wl,-wrap,memalign",
"-Wl,-wrap,posix_memalign",
"-Wl,-wrap,pvalloc",
"-Wl,-wrap,realloc",
"-Wl,-wrap,realpath",
"-Wl,-wrap,strdup",
"-Wl,-wrap,strndup",
"-Wl,-wrap,valloc",
"-Wl,-wrap,vasprintf",
],
stem: "libcronet.108.0.5359.128",
target: {
@ -4167,6 +4197,21 @@ cc_library_static {
"-Wl,--as-needed",
"-Wl,--gc-sections",
"-Wl,--icf=all",
"-Wl,-wrap,asprintf",
"-Wl,-wrap,calloc",
"-Wl,-wrap,free",
"-Wl,-wrap,getcwd",
"-Wl,-wrap,malloc",
"-Wl,-wrap,malloc_usable_size",
"-Wl,-wrap,memalign",
"-Wl,-wrap,posix_memalign",
"-Wl,-wrap,pvalloc",
"-Wl,-wrap,realloc",
"-Wl,-wrap,realpath",
"-Wl,-wrap,strdup",
"-Wl,-wrap,strndup",
"-Wl,-wrap,valloc",
"-Wl,-wrap,vasprintf",
],
target: {
android_arm: {
@ -4307,6 +4352,21 @@ cc_library_static {
"-Wl,--as-needed",
"-Wl,--gc-sections",
"-Wl,--icf=all",
"-Wl,-wrap,asprintf",
"-Wl,-wrap,calloc",
"-Wl,-wrap,free",
"-Wl,-wrap,getcwd",
"-Wl,-wrap,malloc",
"-Wl,-wrap,malloc_usable_size",
"-Wl,-wrap,memalign",
"-Wl,-wrap,posix_memalign",
"-Wl,-wrap,pvalloc",
"-Wl,-wrap,realloc",
"-Wl,-wrap,realpath",
"-Wl,-wrap,strdup",
"-Wl,-wrap,strndup",
"-Wl,-wrap,valloc",
"-Wl,-wrap,vasprintf",
],
target: {
android_arm: {
@ -5941,6 +6001,21 @@ cc_library_static {
"-Wl,--as-needed",
"-Wl,--gc-sections",
"-Wl,--icf=all",
"-Wl,-wrap,asprintf",
"-Wl,-wrap,calloc",
"-Wl,-wrap,free",
"-Wl,-wrap,getcwd",
"-Wl,-wrap,malloc",
"-Wl,-wrap,malloc_usable_size",
"-Wl,-wrap,memalign",
"-Wl,-wrap,posix_memalign",
"-Wl,-wrap,pvalloc",
"-Wl,-wrap,realloc",
"-Wl,-wrap,realpath",
"-Wl,-wrap,strdup",
"-Wl,-wrap,strndup",
"-Wl,-wrap,valloc",
"-Wl,-wrap,vasprintf",
],
target: {
android_arm: {
@ -6411,6 +6486,21 @@ cc_library_static {
"-Wl,--as-needed",
"-Wl,--gc-sections",
"-Wl,--icf=all",
"-Wl,-wrap,asprintf",
"-Wl,-wrap,calloc",
"-Wl,-wrap,free",
"-Wl,-wrap,getcwd",
"-Wl,-wrap,malloc",
"-Wl,-wrap,malloc_usable_size",
"-Wl,-wrap,memalign",
"-Wl,-wrap,posix_memalign",
"-Wl,-wrap,pvalloc",
"-Wl,-wrap,realloc",
"-Wl,-wrap,realpath",
"-Wl,-wrap,strdup",
"-Wl,-wrap,strndup",
"-Wl,-wrap,valloc",
"-Wl,-wrap,vasprintf",
],
target: {
android_arm: {
@ -6942,6 +7032,21 @@ cc_library_static {
"-Wl,--as-needed",
"-Wl,--gc-sections",
"-Wl,--icf=all",
"-Wl,-wrap,asprintf",
"-Wl,-wrap,calloc",
"-Wl,-wrap,free",
"-Wl,-wrap,getcwd",
"-Wl,-wrap,malloc",
"-Wl,-wrap,malloc_usable_size",
"-Wl,-wrap,memalign",
"-Wl,-wrap,posix_memalign",
"-Wl,-wrap,pvalloc",
"-Wl,-wrap,realloc",
"-Wl,-wrap,realpath",
"-Wl,-wrap,strdup",
"-Wl,-wrap,strndup",
"-Wl,-wrap,valloc",
"-Wl,-wrap,vasprintf",
],
target: {
android_arm: {
@ -7125,6 +7230,21 @@ cc_library_static {
"-Wl,--as-needed",
"-Wl,--gc-sections",
"-Wl,--icf=all",
"-Wl,-wrap,asprintf",
"-Wl,-wrap,calloc",
"-Wl,-wrap,free",
"-Wl,-wrap,getcwd",
"-Wl,-wrap,malloc",
"-Wl,-wrap,malloc_usable_size",
"-Wl,-wrap,memalign",
"-Wl,-wrap,posix_memalign",
"-Wl,-wrap,pvalloc",
"-Wl,-wrap,realloc",
"-Wl,-wrap,realpath",
"-Wl,-wrap,strdup",
"-Wl,-wrap,strndup",
"-Wl,-wrap,valloc",
"-Wl,-wrap,vasprintf",
],
target: {
android_arm: {
@ -12708,6 +12828,21 @@ cc_library_static {
"-Wl,--as-needed",
"-Wl,--gc-sections",
"-Wl,--icf=all",
"-Wl,-wrap,asprintf",
"-Wl,-wrap,calloc",
"-Wl,-wrap,free",
"-Wl,-wrap,getcwd",
"-Wl,-wrap,malloc",
"-Wl,-wrap,malloc_usable_size",
"-Wl,-wrap,memalign",
"-Wl,-wrap,posix_memalign",
"-Wl,-wrap,pvalloc",
"-Wl,-wrap,realloc",
"-Wl,-wrap,realpath",
"-Wl,-wrap,strdup",
"-Wl,-wrap,strndup",
"-Wl,-wrap,valloc",
"-Wl,-wrap,vasprintf",
],
target: {
android_arm: {

3
tools/gn2bp/gen_android_bp
View file

@ -1306,7 +1306,8 @@ def _get_cflags(cflags, defines):
def set_module_flags(module, module_type, cflags, defines, ldflags):
module.cflags.update(_get_cflags(cflags, defines))
if module_type != 'cc_object':
module.ldflags.update({flag for flag in ldflags if flag in ldflag_allowlist})
module.ldflags.update({flag for flag in ldflags
if flag in ldflag_allowlist or flag.startswith("-Wl,-wrap,")})
# TODO: implement proper cflag parsing.
for flag in cflags:
if '-std=' in flag: