Detect duplicate ANDROID_EXTRA_LIBS and minor bug fix
ClosedPublic

Authored by sh-zam on Apr 13 2019, 3:02 PM.

Details

Summary

Don't include same dependency twice, one which was found
from readelf in specifydependencies.cmake and other in
ANDROID_EXTRA_LIBS.

Bug fix: find stl was dependent on the order in which libc++
was added, now it is independent.

Test Plan
  • add the same dependency in ANDROID_EXTRA_LIBS

Diff Detail

Repository
R240 Extra CMake Modules
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 10805
Build 10823: arc lint + arc unit
sh-zam created this revision.Apr 13 2019, 3:02 PM
Restricted Application added projects: Frameworks, Build System. · View Herald TranscriptApr 13 2019, 3:02 PM
Restricted Application added a subscriber: kde-buildsystem. · View Herald Transcript
sh-zam requested review of this revision.Apr 13 2019, 3:02 PM
sh-zam updated this revision to Diff 56151.Apr 13 2019, 5:01 PM

minor typo fixed

apol requested changes to this revision.Apr 14 2019, 5:47 PM
apol added inline comments.
toolchain/ECMAndroidDeployQt.cmake
42

Please split into a separate patch.

42

what if it's using an stl version that isn't called .+shared.so?

toolchain/specifydependencies.cmake
24

I'd call the function contains_library, as is it looks that it's duplicating something.

Also pass the output value as an argument instead of magically declaring IS_EQUAL.

40

It shouldn't be necessary to set it back again.

This revision now requires changes to proceed.Apr 14 2019, 5:47 PM
sh-zam updated this revision to Diff 56244.Apr 14 2019, 8:59 PM

improved name and code flow

sh-zam marked 2 inline comments as done.Apr 14 2019, 8:59 PM
apol accepted this revision.Apr 14 2019, 11:59 PM

Looks good to me, can you land it?

This revision is now accepted and ready to land.Apr 14 2019, 11:59 PM
This revision was automatically updated to reflect the committed changes.