JDK-8308110: Resolve multiple definition of 'JNI_OnLoad_jsound' linking error

[jianglizhou]

Remove DEF_STATIC_JNI_OnLoad from src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c. src/java.desktop/share/native/libjsound/Platform.c defines DEF_STATIC_JNI_OnLoad for libjsound.

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8308110: Resolve multiple definition of 'JNI_OnLoad_jsound' linking error

Reviewers

• Alan Bateman (@AlanBateman - Reviewer)
• Chuck Rasbold (@rasbold - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/13994/head:pull/13994
$ git checkout pull/13994

Update a local copy of the PR:
$ git checkout pull/13994
$ git pull https://git.openjdk.org/jdk.git pull/13994/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 13994

View PR using the GUI difftool:
$ git pr show -t 13994

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/13994.diff

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back jiangli! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

@jianglizhou The following label will be automatically applied to this pull request:

• client

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 00: Full (f05a1132)

[AlanBateman]

Probably should wait for someone in the client libs area to review too but I think this is okay. It would require digging into the history to know how the duplicate came about when it is already defined in Platform.c.

[openjdk]

@jianglizhou This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8308110: Resolve multiple definition of 'JNI_OnLoad_jsound' linking error

Reviewed-by: alanb, rasbold

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 41 new commits pushed to the master branch:

• 6d4782b: 8307976: (fs) Files.createDirectories(dir) returns dir::toAbsolutePath instead of dir
• f57c783: 8308239: Tighten up accessibility of nested classes in java.lang.invoke
• 64f6681: 8308246: PPC64le build broken after JDK-8304913
• 5763be7: 8307326: Package jdk.internal.classfile.java.lang.constant become obsolete
• c7951cf: 8306304: Fix xlc17 clang warnings in ppc and aix code
• 285c833: 8308043: Deadlock in TestCSLocker.java due to blocking GC while allocating
• 1a6f981: 8308185: Update Http2TestServerConnection to use SSLSocket.startHandshake()
• b300e73: 8308088: Improve class check in CollectedHeap::is_oop
• e34ecc9: 8296469: Instrument VMError::report with reentrant iteration step for register and stack printing
• 5a92aae: 8308156: VerifyCACerts.java misses blank in error output
• ... and 31 more: https://git.openjdk.org/jdk/compare/57e7a3fbeae56f39f9434b4a97dd915fa14af93d...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

[jianglizhou]

Probably should wait for someone in the client libs area to review too but I think this is okay. It would require digging into the history to know how the duplicate came about when it is already defined in Platform.c.

Thanks for the review. Will wait for additional review as suggested.

According to blame, DEF_STATIC_JNI_OnLoad in PLATFORM_API_LinuxOS_ALSA_CommonUtils.c was added by 3dc2d02 for 8136556: Add the ability to perform static builds of MacOSX x64 binaries. DEF_STATIC_JNI_OnLoad in libjsound/Platform.c was added in the same commit.

[jianglizhou]

Could someone also please take a look of this change? Thanks.

[rasbold]

LGTM

[jianglizhou]

Thanks for the review.

[jianglizhou]

/integrate

[openjdk]

Going to push as commit 902585b.
Since your change was applied there have been 45 commits pushed to the master branch:

• 6073edf: 8307483: New micros for j.u.c.LockSupport
• 2409448: 8307365: JvmtiStressModule hit SIGSEGV in JvmtiEventControllerPrivate::recompute_thread_enabled
• 950c5df: 8307299: Move more DnD tests to open
• 8bedf2e: 8308292: Problemlist vmTestbase/nsk/jvmti/AttachOnDemand/attach020/TestDescription.java
• 6d4782b: 8307976: (fs) Files.createDirectories(dir) returns dir::toAbsolutePath instead of dir
• f57c783: 8308239: Tighten up accessibility of nested classes in java.lang.invoke
• 64f6681: 8308246: PPC64le build broken after JDK-8304913
• 5763be7: 8307326: Package jdk.internal.classfile.java.lang.constant become obsolete
• c7951cf: 8306304: Fix xlc17 clang warnings in ppc and aix code
• 285c833: 8308043: Deadlock in TestCSLocker.java due to blocking GC while allocating
• ... and 35 more: https://git.openjdk.org/jdk/compare/57e7a3fbeae56f39f9434b4a97dd915fa14af93d...master

Your commit was automatically rebased without conflicts.

[openjdk]

@jianglizhou Pushed as commit 902585b.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.