hg: jdk/sandbox: 2 new changesets

[andy.herrick at oracle.com]

Changeset: d92acb18e300
Author:    herrick
Date:      2019-11-04 14:57 -0500
URL:       https://hg.openjdk.java.net/jdk/sandbox/rev/d92acb18e300

Merge

- make/GensrcModuleInfo.gmk
! make/common/Modules.gmk
! make/common/NativeCompilation.gmk
- src/hotspot/share/jfr/recorder/repository/jfrChunkState.cpp
- src/hotspot/share/jfr/recorder/repository/jfrChunkState.hpp
- src/jdk.hotspot.agent/linux/native/libsaproc/LinuxDebuggerLocal.c
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/MethodSubstitutionRegistry.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/MemoryScheduleVerification.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/ExportingClassLoader.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/ModuleSupport.java
- src/jdk.jfr/share/classes/jdk/jfr/consumer/ChunkParser.java
- src/jdk.jfr/share/classes/jdk/jfr/consumer/ConstantMap.java
- src/jdk.jfr/share/classes/jdk/jfr/consumer/EventParser.java
- src/jdk.jfr/share/classes/jdk/jfr/consumer/LongMap.java
- src/jdk.jfr/share/classes/jdk/jfr/consumer/ObjectFactory.java
- src/jdk.jfr/share/classes/jdk/jfr/consumer/Parser.java
- src/jdk.jfr/share/classes/jdk/jfr/consumer/ParserFactory.java
- src/jdk.jfr/share/classes/jdk/jfr/consumer/TimeConverter.java
- src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/RecordingInternals.java
! src/jdk.jlink/share/classes/module-info.java
- test/hotspot/jtreg/runtime/Thread/CountStackFramesAtExit.java
- test/jdk/java/nio/channels/DatagramChannel/AdaptDatagramSocket.java

Changeset: fbaf2e6402ad
Author:    herrick
Date:      2019-11-04 15:06 -0500
URL:       https://hg.openjdk.java.net/jdk/sandbox/rev/fbaf2e6402ad

8232919 : If user installs msi and exe, two installations are found in Add/Remove
Submitted-by: asemenyuk
Reviewed-by: aherrick, almatvee

! make/CompileJavaModules.gmk
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_en.wxl
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_ja.wxl
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_zh_CN.wxl
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/main.wxs
+ src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/overrides.wxi
! test/jdk/tools/jpackage/windows/WinResourceTest.java