src/jdk.jartool/share/classes/sun/tools/jar/Main.java

*** 61,70 ****
--- 61,71 ----
  import jdk.internal.module.ModuleHashes;
  import jdk.internal.module.ModuleHashesBuilder;
  import jdk.internal.module.ModuleInfo;
  import jdk.internal.module.ModuleInfoExtender;
  import jdk.internal.module.ModuleResolution;
+ import jdk.internal.module.ModuleTarget;
  import jdk.internal.util.jar.JarIndex;
  
  import static jdk.internal.util.jar.JarIndex.INDEX_NAME;
  import static java.util.jar.JarFile.MANIFEST_NAME;
  import static java.util.stream.Collectors.joining;
*** 1778,1787 ****
--- 1779,1789 ----
      private void printModuleDescriptor(InputStream entryInputStream, String ename)
          throws IOException
      {
          ModuleInfo.Attributes attrs = ModuleInfo.read(entryInputStream, null);
          ModuleDescriptor md = attrs.descriptor();
+         ModuleTarget target = attrs.target();
          ModuleHashes hashes = attrs.recordedHashes();
  
          StringBuilder sb = new StringBuilder();
          sb.append("\nmodule ")
            .append(md.toNameAndVersion())
*** 1822,1836 ****
                              .append(" with ")
                              .append(toString(p.providers())));
  
          md.mainClass().ifPresent(v -> sb.append("\n  main-class " + v));
  
!         md.osName().ifPresent(v -> sb.append("\n  operating-system-name " + v));
! 
!         md.osArch().ifPresent(v -> sb.append("\n  operating-system-architecture " + v));
! 
!         md.osVersion().ifPresent(v -> sb.append("\n  operating-system-version " + v));
  
         if (hashes != null) {
             hashes.names().stream().sorted().forEach(
                     mod -> sb.append("\n  hashes ").append(mod).append(" ")
                              .append(hashes.algorithm()).append(" ")
--- 1824,1841 ----
                              .append(" with ")
                              .append(toString(p.providers())));
  
          md.mainClass().ifPresent(v -> sb.append("\n  main-class " + v));
  
!         if (target != null) {
!             String osName = target.osName();
!             if (osName != null)
!                 sb.append("\n  operating-system-name " + osName);
!             String osArch = target.osArch();
!             if (osArch != null)
!                 sb.append("\n  operating-system-architecture " + osArch);
!        }
  
         if (hashes != null) {
             hashes.names().stream().sorted().forEach(
                     mod -> sb.append("\n  hashes ").append(mod).append(" ")
                              .append(hashes.algorithm()).append(" ")