[Rev 01] RFR: 8244947: fix ios/android build for static libs

Johan Vos jvos at openjdk.java.net
Thu May 14 12:37:44 UTC 2020


On Thu, 14 May 2020 08:05:43 GMT, Magnus Ihse Bursie <ihse at openjdk.org> wrote:

>> Johan Vos has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   remove typo
>
> make/common/JdkNativeCompilation.gmk line 55:
> 
>> 54: endif
>> 55:
>> 56: FindSrcDirsForLib += \
> 
> This needs some work. First of all, FindSrcDirsForLib should only be added to using +=, since the variable can have a
> prior value from the custom (closed) file. Secondly, later down,  FindSrcDirsForLib will have the "standard"
> directories appended, so no need to duplicate that here. Thirdly, order is important. If two files with the same name
> is present in the code base, only one will be selected, and the order of the directories in  FindSrcDirsForLib will
> determine the priorites. This code basically says "first ios, then unix, then macosx" or "first android, then unix,
> then linux". If this order is correct, then a better way to accomplish this is to just append macosx or linux *after*
> the normal assignment to  FindSrcDirsForLib below.

Thanks for that remark, that makes sense. I updated the PR.
The problem is that on ios/android, we have 3 possible paths instead of the regular 2 (OPENJDK_TARGET_OS and
OPENJDK_TARGET_OS_TYPE) But your suggestion makes it much better to add the third path.

-------------

PR: https://git.openjdk.java.net/mobile/pull/4


More information about the mobile-dev mailing list