Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Android 10 support (Q linker) #467

Merged
merged 15 commits into from Feb 3, 2021
Merged

Android 10 support (Q linker) #467

merged 15 commits into from Feb 3, 2021

Conversation

sledges
Copy link
Contributor

@sledges sledges commented Nov 6, 2020

This is a continued effort of #425.
Has been improved upon and booted on Xperia 10 II running Sailfish OS.

Started this new PR as clean slate with permission from libhybris maintainer.

@sledges
Copy link
Contributor Author

sledges commented Nov 6, 2020

erfanoabdi@41a7245

plz check this out

Thank you.
@Thaodan, this is related to your 7a63e08 commit.

@sledges sledges mentioned this pull request Nov 6, 2020
Closed
@Thaodan
Copy link
Contributor

Thaodan commented Nov 6, 2020 via email

@Thaodan
Copy link
Contributor

Thaodan commented Nov 19, 2020

Need to add that to test spec file after we merge this /usr/bin/test_dlopen.

@Thaodan
Copy link
Contributor

Thaodan commented Nov 19, 2020

Please remove CXX="-std=c++14"

@sledges
Copy link
Contributor Author

sledges commented Nov 19, 2020

Please remove CXX="-std=c++14"

Done thanks.

@sledges
Copy link
Contributor Author

sledges commented Nov 19, 2020

Need to add that to test spec file after we merge this /usr/bin/test_dlopen.

Ah sorry, forgot to push that few weeks ago :) mer-hybris/libhybris#58

@sledges sledges mentioned this pull request Nov 19, 2020
Merged
@krnlyng
Copy link
Member

krnlyng commented Dec 19, 2020

@sledges can we fix this 514c446

as it has been done on droidmedia side by @mlehtima

mlehtima/droidmedia@d1a2800

@sledges sledges mentioned this pull request Dec 24, 2020
Merged
mlehtima
mlehtima reviewed Jan 7, 2021
View reviewed changes
hybris/common/q/dlfcn.cpp Outdated Show resolved Hide resolved
mlehtima
mlehtima reviewed Jan 7, 2021
View reviewed changes
hybris/common/q/linker.cpp Outdated Show resolved Hide resolved
mlehtima
mlehtima reviewed Jan 7, 2021
View reviewed changes
hybris/common/q/linker.cpp Outdated Show resolved Hide resolved
mlehtima
mlehtima requested changes Jan 7, 2021
View reviewed changes
Copy link
Contributor

@mlehtima mlehtima left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also some excessive logging happens when launching apps from command line.

hybris/tests/test_dlopen.c Outdated Show resolved Hide resolved
hybris/libsync/sync.c Outdated Show resolved Hide resolved
hybris/common/q/hybris_compat.h Show resolved Hide resolved
hybris/common/q/linker_gdb_support.cpp Show resolved Hide resolved
@krnlyng
Copy link
Member

krnlyng commented Jan 18, 2021

@sledges please also apply d5183fe to the q linker

Wu Zhongmin added 2 commits February 1, 2021 08:58
@sledges
q: Copy original q's linker into the project
0659c64 
Signed-off-by: Wu Zhongmin <zhongmin.wu@intel.com>
@sledges
q: Add hybris support for Android Q
336ba4f 
(Only verified on Android X86_64 (Intel Celadon) )

Signed-off-by: Zhongmin Wu <zhongmin.wu@intel.com>
@sledges
Copy link
Contributor Author

sledges commented Feb 1, 2021 •
edited

@sledges can we fix this 514c446

as it has been done on droidmedia side by @mlehtima

mlehtima/droidmedia@d1a2800

Done in compat: Support checking 32-bit-only build from Android.bp for camera and media. @erfanoabdi please, check this out:)

@sledges
Copy link
Contributor Author

sledges commented Feb 1, 2021 •
edited

@sledges please also apply d5183fe to the q linker

Done in q: avoid excessive printing of non-errors when dlsym does not find a symbol.

@sledges
Copy link
Contributor Author

sledges commented Feb 1, 2021

Tested on the previous adaptation -- Xperia 10 -- everything still works there too. Also build sanity-tested for couple of older adaptations.

krnlyng and others added 4 commits February 1, 2021 10:45
@krnlyng @sledges
q: add some fixes/hacks to the android q linker to make it work on arm
fc7bfd1
@sledges
q: Remove useless Android.bp file
efbc2be 
Signed-off-by: Zhongmin Wu <zhongmin.wu@intel.com>
@mlehtima @sledges
compat: Support checking 32-bit-only build from Android.bp for camera…
2a582dc 
… and media

Also always check in mediaserver, because libmediaplayerservice is not reliable
(in some bases it has LOCAL_32_BIT_ONLY commented out, when mediaserver hasn't).
@Thaodan @sledges
compat: hwc2: Apply includes for Android 9 to Android 10
8e876d7 
Also fix syntax error.
Thaodan and others added 9 commits February 1, 2021 10:46
@Thaodan @sledges
tests: Use -std=c99 for audio tests
ae48335 
Since Android Q the audio headers included in the audio test contain
C99 style loops, tell gcc to use C99 instead of the default C89 to
avoid errors.
@sledges
tests: Add the license for test_dlopen.c
83b4525 
Signed-off-by: Zhongmin Wu <zhongmin.wu@intel.com>
@sledges
q: fix build errors with R_AARCH64_TLS_*64
e7d7982 
Signed-off-by: Simonas Leleiva <simonas.leleiva@jolla.com>
@sledges
q: disable certain TLS code paths
044364f 
Signed-off-by: Simonas Leleiva <simonas.leleiva@jolla.com>
@sledges
q: do not point libhybris structs to glibc structs
8610467 
We don't want libhybris modifying glibc's link_map objects,
which should not be linked to bionic's stripped link_map objects.

Let' make a copy of the whole chain.

Signed-off-by: Simonas Leleiva <simonas.leleiva@jolla.com>
@sledges
q: solist and soinfo adjustments
533f68d 
Signed-off-by: Simonas Leleiva <simonas.leleiva@jolla.com>
@sledges
hybris: android 10 hwcomposer headers are in C++
4bbbf7a 
Signed-off-by: Simonas Leleiva <simonas.leleiva@jolla.com>
@sledges
q: drop unneeded .S assembly files
de05a83 
Signed-off-by: Simonas Leleiva <simonas.leleiva@jolla.com>
@krnlyng @sledges
q: avoid excessive printing of non-errors when dlsym does not find a …
b09a67a 
…symbol

Backported from o linker.

Signed-off-by: Simonas Leleiva <simonas.leleiva@jolla.com>
@erfanoabdi
Copy link
Contributor

@sledges can we fix this 514c446
as it has been done on droidmedia side by @mlehtima
mlehtima/droidmedia@d1a2800

Done in compat: Support checking 32-bit-only build from Android.bp for camera and media. @erfanoabdi please, check this out:)

Thanks, looks good to me

@krnlyng krnlyng merged commit b98cedb into libhybris:master Feb 3, 2021
@Herrie82
Copy link
Contributor

@krnlyng @sledges @mlehtima @mkosola @Thaodan It seems that this merged PR broke the extract-headers.sh script. The "if" check introduced in https://github.com/libhybris/libhybris/blob/master/utils/extract-headers.sh#L246 is never ended by a "fi". I'm not really sure where this check comes from. Maybe a merge error somehow. Should it be there altogether?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@krnlyng krnlyng krnlyng approved these changes

@mkosola mkosola mkosola approved these changes

@mlehtima mlehtima mlehtima approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@sledges @Thaodan @krnlyng @erfanoabdi @Herrie82 @mkosola @mlehtima