< prev index next >

make/nb_native/nbproject/configurations.xml

Print this page

        

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="97">
+<configurationDescriptor version="100">
   <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
     <df root="../.." name="0">
       <df name="build">
         <df name="hotspot">
           <df name="linux_amd64_compiler2">

@@ -2080,10 +2080,38 @@
                   <in>VirtualMachineImpl.c</in>
                 </df>
               </df>
             </df>
           </df>
+          <df name="jdk.crypto.cryptoki">
+            <df name="share">
+              <df name="native">
+                <df name="libj2pkcs11">
+                  <in>j2secmod.c</in>
+                  <in>p11_convert.c</in>
+                  <in>p11_crypt.c</in>
+                  <in>p11_digest.c</in>
+                  <in>p11_dual.c</in>
+                  <in>p11_general.c</in>
+                  <in>p11_keymgmt.c</in>
+                  <in>p11_mutex.c</in>
+                  <in>p11_objmgmt.c</in>
+                  <in>p11_sessmgmt.c</in>
+                  <in>p11_sign.c</in>
+                  <in>p11_util.c</in>
+                </df>
+              </df>
+            </df>
+            <df name="unix">
+              <df name="native">
+                <df name="libj2pkcs11">
+                  <in>j2secmod_md.c</in>
+                  <in>p11_md.c</in>
+                </df>
+              </df>
+            </df>
+          </df>
           <df name="jdk.crypto.ec">
             <df name="share">
               <df name="native">
                 <df name="libsunec">
                   <df name="impl">

@@ -2118,38 +2146,10 @@
                   <in>ECC_JNI.cpp</in>
                 </df>
               </df>
             </df>
           </df>
-          <df name="jdk.crypto.cryptoki">
-            <df name="share">
-              <df name="native">
-                <df name="libj2pkcs11">
-                  <in>j2secmod.c</in>
-                  <in>p11_convert.c</in>
-                  <in>p11_crypt.c</in>
-                  <in>p11_digest.c</in>
-                  <in>p11_dual.c</in>
-                  <in>p11_general.c</in>
-                  <in>p11_keymgmt.c</in>
-                  <in>p11_mutex.c</in>
-                  <in>p11_objmgmt.c</in>
-                  <in>p11_sessmgmt.c</in>
-                  <in>p11_sign.c</in>
-                  <in>p11_util.c</in>
-                </df>
-              </df>
-            </df>
-            <df name="unix">
-              <df name="native">
-                <df name="libj2pkcs11">
-                  <in>j2secmod_md.c</in>
-                  <in>p11_md.c</in>
-                </df>
-              </df>
-            </df>
-          </df>
           <df name="jdk.crypto.ucrypto">
             <df name="solaris">
               <df name="native">
                 <df name="libj2ucrypto">
                   <in>nativeCrypto.c</in>

@@ -29089,299 +29089,299 @@
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp"
-            ex="false"
-            tool="1"
-            flavor2="4">
-      </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_163.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_193.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_233.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_digest.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_aff.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_dual.c"
             ex="false"
             tool="0"
-            flavor2="3">
-        <cTool flags="5">
+            flavor2="2">
+        <cTool flags="2">
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_dual.c"</Elem>
+          </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_mont.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec_naf.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecdecode.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_mutex.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_objmgmt.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_curve.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sessmgmt.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_gf.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sign.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_mult.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_192.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_224.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_256.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp"
+            ex="false"
+            tool="1"
+            flavor2="4">
+      </item>
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_384.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_163.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_521.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_193.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_aff.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_233.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jac.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_aff.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jm.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_mont.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_mont.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec_naf.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecdecode.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpi.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mplogic.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_curve.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpmontg.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_gf.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/oid.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_mult.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/secitem.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_192.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_224.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_256.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_384.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_digest.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_521.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_dual.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_aff.c"
             ex="false"
             tool="0"
-            flavor2="2">
-        <cTool flags="2">
-          <preprocessorList>
-            <Elem>THIS_FILE="p11_dual.c"</Elem>
-          </preprocessorList>
+            flavor2="3">
+        <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jac.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jm.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_mutex.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_mont.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_objmgmt.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sessmgmt.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpi.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sign.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mplogic.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpmontg.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/oid.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/secitem.c"
             ex="false"
             tool="0"
             flavor2="3">
         <cTool flags="5">
         </cTool>

@@ -31471,37 +31471,10 @@
             <Elem>DEBUG</Elem>
             <Elem>THIS_FILE="VirtualMachineImpl.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
-      <folder path="0/jdk/src/jdk.crypto.ec">
-        <cTool>
-          <incDir>
-            <pElem>../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl</pElem>
-            <pElem>../../make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DEBUG</Elem>
-            <Elem>MP_API_COMPATIBLE</Elem>
-            <Elem>NSS_ECC_MORE_THAN_SUITE_B</Elem>
-            <Elem>THIS_FILE="ec.c"</Elem>
-          </preprocessorList>
-        </cTool>
-        <ccTool>
-          <incDir>
-            <pElem>../../jdk/src/java.base/share/native/include</pElem>
-            <pElem>../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl</pElem>
-            <pElem>../../jdk/src/java.base/macosx/native/include</pElem>
-            <pElem>../../jdk/src/jdk.crypto.ec/share/native/libsunec</pElem>
-            <pElem>../../make</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>DEBUG</Elem>
-            <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
       <folder path="0/jdk/src/jdk.crypto.cryptoki">
         <cTool>
           <incDir>
             <pElem>../../jdk/src/java.base/share/native/include</pElem>
             <pElem>../../jdk/src/java.base/macosx/native/include</pElem>

@@ -31525,10 +31498,37 @@
           <preprocessorList>
             <Elem>THIS_FILE="j2secmod_md.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
+      <folder path="0/jdk/src/jdk.crypto.ec">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl</pElem>
+            <pElem>../../make</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DEBUG</Elem>
+            <Elem>MP_API_COMPATIBLE</Elem>
+            <Elem>NSS_ECC_MORE_THAN_SUITE_B</Elem>
+            <Elem>THIS_FILE="ec.c"</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>../../jdk/src/java.base/share/native/include</pElem>
+            <pElem>../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl</pElem>
+            <pElem>../../jdk/src/java.base/macosx/native/include</pElem>
+            <pElem>../../jdk/src/jdk.crypto.ec/share/native/libsunec</pElem>
+            <pElem>../../make</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DEBUG</Elem>
+            <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
       <folder path="0/jdk/src/jdk.jdwp.agent">
         <cTool>
           <incDir>
             <pElem>../../jdk/src/java.base/share/native/include</pElem>
             <pElem>../../jdk/src/java.base/macosx/native/include</pElem>

@@ -31741,15 +31741,14 @@
                  commonFlags="-fPIC -fno-rtti -fno-exceptions -m64 -fstack-protector-all"/>
         <element flagsID="1" commonFlags="-fno-rtti -fno-exceptions"/>
         <element flagsID="2" commonFlags="-fstack-protector-all -fPIC"/>
         <element flagsID="3" commonFlags="-g"/>
         <element flagsID="4" commonFlags="-g -fstack-protector-all -fPIC -g"/>
-        <element flagsID="5" commonFlags="-g -fstack-protector-all -fPIC -g -g"/>
-        <element flagsID="6"
+        <element flagsID="5"
                  commonFlags="-g -fstack-protector-all -g -fstack-protector-all -fPIC -g"/>
-        <element flagsID="7" commonFlags="-g -m64 -fPIC"/>
-        <element flagsID="8" commonFlags="-m64"/>
+        <element flagsID="6" commonFlags="-g -m64 -fPIC"/>
+        <element flagsID="7" commonFlags="-m64"/>
       </flagsDictionary>
       <codeAssistance>
         <transientMacros>
           <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
           <Elem>HOTSPOT_BUILD_USER="user"</Elem>

@@ -31861,11 +31860,11 @@
       </item>
       <item path="../../build/support/gensrc/java.desktop/_x11wrappers/sizer.64.c"
             ex="false"
             tool="0"
             flavor2="0">
-        <cTool flags="8">
+        <cTool flags="7">
         </cTool>
       </item>
       <item path="../../hotspot/src/cpu/x86/vm/abstractInterpreter_x86.cpp"
             ex="false"
             tool="1"

@@ -32240,11 +32239,11 @@
       </item>
       <item path="../../hotspot/src/os/linux/vm/jsig.c"
             ex="false"
             tool="0"
             flavor2="0">
-        <cTool flags="7">
+        <cTool flags="6">
         </cTool>
       </item>
       <item path="../../hotspot/src/os/linux/vm/jvm_linux.cpp"
             ex="false"
             tool="1"

@@ -36724,11 +36723,11 @@
       </item>
       <item path="../../jdk/src/java.base/share/native/launcher/main.c"
             ex="false"
             tool="0"
             flavor2="0">
-        <cTool flags="6">
+        <cTool flags="5">
         </cTool>
       </item>
       <item path="../../jdk/src/java.base/share/native/libfdlibm/e_acos.c"
             ex="false"
             tool="0"

@@ -44113,415 +44112,415 @@
             tool="0"
             flavor2="0">
         <cTool flags="4">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool flags="2">
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_163.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="ec2_163.c"</Elem>
+            <Elem>THIS_FILE="p11_convert.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_193.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="ec2_193.c"</Elem>
+            <Elem>THIS_FILE="p11_crypt.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_233.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_digest.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="ec2_233.c"</Elem>
+            <Elem>THIS_FILE="p11_digest.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_aff.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_dual.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="ec2_aff.c"</Elem>
+            <Elem>THIS_FILE="p11_dual.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_mont.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="ec2_mont.c"</Elem>
+            <Elem>THIS_FILE="p11_general.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec_naf.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="ec_naf.c"</Elem>
+            <Elem>THIS_FILE="p11_keymgmt.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecdecode.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_mutex.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="ecdecode.c"</Elem>
+            <Elem>THIS_FILE="p11_mutex.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_objmgmt.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="ecl.c"</Elem>
+            <Elem>THIS_FILE="p11_objmgmt.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_curve.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sessmgmt.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="ecl_curve.c"</Elem>
+            <Elem>THIS_FILE="p11_sessmgmt.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_gf.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sign.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="ecl_gf.c"</Elem>
+            <Elem>THIS_FILE="p11_sign.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_mult.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="ecl_mult.c"</Elem>
+            <Elem>THIS_FILE="p11_util.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_192.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
-          <preprocessorList>
-            <Elem>THIS_FILE="ecp_192.c"</Elem>
-          </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_224.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="ecp_224.c"</Elem>
+            <Elem>THIS_FILE="p11_md.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_256.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool flags="2">
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
-          <preprocessorList>
-            <Elem>THIS_FILE="ecp_256.c"</Elem>
-          </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_384.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_163.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="ecp_384.c"</Elem>
+            <Elem>THIS_FILE="ec2_163.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_521.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_193.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="ecp_521.c"</Elem>
+            <Elem>THIS_FILE="ec2_193.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_aff.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_233.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="ecp_aff.c"</Elem>
+            <Elem>THIS_FILE="ec2_233.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jac.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_aff.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="ecp_jac.c"</Elem>
+            <Elem>THIS_FILE="ec2_aff.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jm.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_mont.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="ecp_jm.c"</Elem>
+            <Elem>THIS_FILE="ec2_mont.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_mont.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec_naf.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="ecp_mont.c"</Elem>
+            <Elem>THIS_FILE="ec_naf.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecdecode.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="mp_gf2m.c"</Elem>
+            <Elem>THIS_FILE="ecdecode.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpi.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="mpi.c"</Elem>
+            <Elem>THIS_FILE="ecl.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mplogic.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_curve.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="mplogic.c"</Elem>
+            <Elem>THIS_FILE="ecl_curve.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpmontg.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_gf.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="mpmontg.c"</Elem>
+            <Elem>THIS_FILE="ecl_gf.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/oid.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_mult.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="oid.c"</Elem>
+            <Elem>THIS_FILE="ecl_mult.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/secitem.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_192.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="secitem.c"</Elem>
+            <Elem>THIS_FILE="ecp_192.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_224.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
+          <preprocessorList>
+            <Elem>THIS_FILE="ecp_224.c"</Elem>
+          </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_256.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_convert.c"</Elem>
+            <Elem>THIS_FILE="ecp_256.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_384.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_crypt.c"</Elem>
+            <Elem>THIS_FILE="ecp_384.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_digest.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_521.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_digest.c"</Elem>
+            <Elem>THIS_FILE="ecp_521.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_dual.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_aff.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_dual.c"</Elem>
+            <Elem>THIS_FILE="ecp_aff.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jac.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_general.c"</Elem>
+            <Elem>THIS_FILE="ecp_jac.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jm.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_keymgmt.c"</Elem>
+            <Elem>THIS_FILE="ecp_jm.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_mutex.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_mont.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_mutex.c"</Elem>
+            <Elem>THIS_FILE="ecp_mont.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_objmgmt.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_objmgmt.c"</Elem>
+            <Elem>THIS_FILE="mp_gf2m.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sessmgmt.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpi.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_sessmgmt.c"</Elem>
+            <Elem>THIS_FILE="mpi.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sign.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mplogic.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_sign.c"</Elem>
+            <Elem>THIS_FILE="mplogic.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpmontg.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_util.c"</Elem>
+            <Elem>THIS_FILE="mpmontg.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/oid.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
+          <preprocessorList>
+            <Elem>THIS_FILE="oid.c"</Elem>
+          </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/secitem.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="4">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_md.c"</Elem>
+            <Elem>THIS_FILE="secitem.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.c"
             ex="false"

@@ -47232,68 +47231,68 @@
             <Elem>DEBUG</Elem>
             <Elem>THIS_FILE="VirtualMachineImpl.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
-      <folder path="0/jdk/src/jdk.crypto.ec">
+      <folder path="0/jdk/src/jdk.crypto.cryptoki">
         <cTool>
           <incDir>
             <pElem>../../jdk/src/java.base/share/native/include</pElem>
             <pElem>../../jdk/src/java.base/linux/native/include</pElem>
             <pElem>../../jdk/src/java.base/unix/native/include</pElem>
             <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
             <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
+            <pElem>../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11</pElem>
+            <pElem>../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11</pElem>
+            <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
+            <pElem>../../build/support/headers/jdk.crypto.cryptoki</pElem>
             <pElem>../../make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>DEBUG</Elem>
-            <Elem>MP_API_COMPATIBLE</Elem>
-            <Elem>NSS_ECC_MORE_THAN_SUITE_B</Elem>
-            <Elem>THIS_FILE="ec.c"</Elem>
+            <Elem>THIS_FILE="j2secmod.c"</Elem>
           </preprocessorList>
         </cTool>
-        <ccTool>
+      </folder>
+      <folder path="0/jdk/src/jdk.crypto.cryptoki/unix">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="j2secmod_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="0/jdk/src/jdk.crypto.ec">
+        <cTool>
           <incDir>
             <pElem>../../jdk/src/java.base/share/native/include</pElem>
             <pElem>../../jdk/src/java.base/linux/native/include</pElem>
             <pElem>../../jdk/src/java.base/unix/native/include</pElem>
             <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
             <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
             <pElem>../../make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>DEBUG</Elem>
-            <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
+            <Elem>MP_API_COMPATIBLE</Elem>
+            <Elem>NSS_ECC_MORE_THAN_SUITE_B</Elem>
+            <Elem>THIS_FILE="ec.c"</Elem>
           </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="0/jdk/src/jdk.crypto.cryptoki">
-        <cTool>
+        </cTool>
+        <ccTool>
           <incDir>
             <pElem>../../jdk/src/java.base/share/native/include</pElem>
             <pElem>../../jdk/src/java.base/linux/native/include</pElem>
             <pElem>../../jdk/src/java.base/unix/native/include</pElem>
             <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
             <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
-            <pElem>../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11</pElem>
-            <pElem>../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11</pElem>
-            <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
-            <pElem>../../build/support/headers/jdk.crypto.cryptoki</pElem>
             <pElem>../../make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>DEBUG</Elem>
-            <Elem>THIS_FILE="j2secmod.c"</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="0/jdk/src/jdk.crypto.cryptoki/unix">
-        <cTool>
-          <preprocessorList>
-            <Elem>THIS_FILE="j2secmod_md.c"</Elem>
+            <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
           </preprocessorList>
-        </cTool>
+        </ccTool>
       </folder>
       <folder path="0/jdk/src/jdk.jdwp.agent">
         <cTool>
           <incDir>
             <pElem>../../jdk/src/java.base/share/native/include</pElem>

@@ -47528,12 +47527,11 @@
       </toolsSet>
       <flagsDictionary>
         <element flagsID="0" commonFlags="-m64"/>
         <element flagsID="1" commonFlags="-m64 -g"/>
         <element flagsID="2" commonFlags="-m64 -g -g"/>
-        <element flagsID="3" commonFlags="-m64 -g -g -g"/>
-        <element flagsID="4" commonFlags="-m64 -g -m64 -g -g"/>
+        <element flagsID="3" commonFlags="-m64 -g -m64 -g -g"/>
       </flagsDictionary>
       <codeAssistance>
         <transientMacros>
           <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
           <Elem>HOTSPOT_BUILD_USER="user"</Elem>

@@ -54708,11 +54706,11 @@
       </item>
       <item path="../../jdk/src/java.base/share/native/launcher/main.c"
             ex="false"
             tool="0"
             flavor2="0">
-        <cTool flags="4">
+        <cTool flags="3">
         </cTool>
       </item>
       <item path="../../jdk/src/java.base/share/native/libfdlibm/e_acos.c"
             ex="false"
             tool="0"

@@ -61816,415 +61814,415 @@
             tool="0"
             flavor2="0">
         <cTool flags="2">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp"
-            ex="false"
-            tool="1"
-            flavor2="0">
-        <ccTool flags="0">
-        </ccTool>
-      </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_163.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="ec2_163.c"</Elem>
+            <Elem>THIS_FILE="p11_convert.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_193.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="ec2_193.c"</Elem>
+            <Elem>THIS_FILE="p11_crypt.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_233.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_digest.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="ec2_233.c"</Elem>
+            <Elem>THIS_FILE="p11_digest.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_aff.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_dual.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="ec2_aff.c"</Elem>
+            <Elem>THIS_FILE="p11_dual.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_mont.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="ec2_mont.c"</Elem>
+            <Elem>THIS_FILE="p11_general.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec_naf.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="ec_naf.c"</Elem>
+            <Elem>THIS_FILE="p11_keymgmt.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecdecode.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_mutex.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="ecdecode.c"</Elem>
+            <Elem>THIS_FILE="p11_mutex.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_objmgmt.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="ecl.c"</Elem>
+            <Elem>THIS_FILE="p11_objmgmt.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_curve.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sessmgmt.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="ecl_curve.c"</Elem>
+            <Elem>THIS_FILE="p11_sessmgmt.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_gf.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sign.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="ecl_gf.c"</Elem>
+            <Elem>THIS_FILE="p11_sign.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_mult.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="ecl_mult.c"</Elem>
+            <Elem>THIS_FILE="p11_util.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_192.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
-          <preprocessorList>
-            <Elem>THIS_FILE="ecp_192.c"</Elem>
-          </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_224.c"
+      <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="ecp_224.c"</Elem>
+            <Elem>THIS_FILE="p11_md.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_256.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool flags="0">
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
-          <preprocessorList>
-            <Elem>THIS_FILE="ecp_256.c"</Elem>
-          </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_384.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_163.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="ecp_384.c"</Elem>
+            <Elem>THIS_FILE="ec2_163.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_521.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_193.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="ecp_521.c"</Elem>
+            <Elem>THIS_FILE="ec2_193.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_aff.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_233.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="ecp_aff.c"</Elem>
+            <Elem>THIS_FILE="ec2_233.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jac.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_aff.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="ecp_jac.c"</Elem>
+            <Elem>THIS_FILE="ec2_aff.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jm.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_mont.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="ecp_jm.c"</Elem>
+            <Elem>THIS_FILE="ec2_mont.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_mont.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec_naf.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="ecp_mont.c"</Elem>
+            <Elem>THIS_FILE="ec_naf.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecdecode.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="mp_gf2m.c"</Elem>
+            <Elem>THIS_FILE="ecdecode.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpi.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="mpi.c"</Elem>
+            <Elem>THIS_FILE="ecl.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mplogic.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_curve.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="mplogic.c"</Elem>
+            <Elem>THIS_FILE="ecl_curve.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpmontg.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_gf.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="mpmontg.c"</Elem>
+            <Elem>THIS_FILE="ecl_gf.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/oid.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecl_mult.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="oid.c"</Elem>
+            <Elem>THIS_FILE="ecl_mult.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/secitem.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_192.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="secitem.c"</Elem>
+            <Elem>THIS_FILE="ecp_192.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_224.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
+          <preprocessorList>
+            <Elem>THIS_FILE="ecp_224.c"</Elem>
+          </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_256.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_convert.c"</Elem>
+            <Elem>THIS_FILE="ecp_256.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_384.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_crypt.c"</Elem>
+            <Elem>THIS_FILE="ecp_384.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_digest.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_521.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_digest.c"</Elem>
+            <Elem>THIS_FILE="ecp_521.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_dual.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_aff.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_dual.c"</Elem>
+            <Elem>THIS_FILE="ecp_aff.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jac.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_general.c"</Elem>
+            <Elem>THIS_FILE="ecp_jac.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_jm.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_keymgmt.c"</Elem>
+            <Elem>THIS_FILE="ecp_jm.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_mutex.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ecp_mont.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_mutex.c"</Elem>
+            <Elem>THIS_FILE="ecp_mont.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_objmgmt.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mp_gf2m.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_objmgmt.c"</Elem>
+            <Elem>THIS_FILE="mp_gf2m.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sessmgmt.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpi.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_sessmgmt.c"</Elem>
+            <Elem>THIS_FILE="mpi.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sign.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mplogic.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_sign.c"</Elem>
+            <Elem>THIS_FILE="mplogic.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/mpmontg.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_util.c"</Elem>
+            <Elem>THIS_FILE="mpmontg.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/oid.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
+          <preprocessorList>
+            <Elem>THIS_FILE="oid.c"</Elem>
+          </preprocessorList>
         </cTool>
       </item>
-      <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c"
+      <item path="../../jdk/src/jdk.crypto.ec/share/native/libsunec/impl/secitem.c"
             ex="false"
             tool="0"
             flavor2="0">
         <cTool flags="2">
           <preprocessorList>
-            <Elem>THIS_FILE="p11_md.c"</Elem>
+            <Elem>THIS_FILE="secitem.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCrypto.c"
             ex="false"

@@ -65431,63 +65429,63 @@
             <Elem>DEBUG</Elem>
             <Elem>THIS_FILE="VirtualMachineImpl.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
-      <folder path="0/jdk/src/jdk.crypto.ec">
+      <folder path="0/jdk/src/jdk.crypto.cryptoki">
         <cTool>
           <incDir>
             <pElem>../../jdk/src/java.base/share/native/include</pElem>
             <pElem>../../jdk/src/java.base/solaris/native/include</pElem>
             <pElem>../../jdk/src/java.base/unix/native/include</pElem>
             <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
             <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
+            <pElem>../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11</pElem>
+            <pElem>../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11</pElem>
+            <pElem>../../jdk/src/java.base/solaris/native/libjava</pElem>
+            <pElem>../../build/support/headers/jdk.crypto.cryptoki</pElem>
             <pElem>../../make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>DEBUG</Elem>
-            <Elem>MP_API_COMPATIBLE</Elem>
-            <Elem>NSS_ECC_MORE_THAN_SUITE_B</Elem>
-            <Elem>THIS_FILE="ec.c"</Elem>
+            <Elem>THIS_FILE="j2secmod.c"</Elem>
           </preprocessorList>
         </cTool>
-        <ccTool>
-          <incDir>
-            <pElem>../../make</pElem>
-          </incDir>
+      </folder>
+      <folder path="0/jdk/src/jdk.crypto.cryptoki/unix">
+        <cTool>
           <preprocessorList>
-            <Elem>DEBUG</Elem>
-            <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
+            <Elem>THIS_FILE="j2secmod_md.c"</Elem>
           </preprocessorList>
-        </ccTool>
+        </cTool>
       </folder>
-      <folder path="0/jdk/src/jdk.crypto.cryptoki">
+      <folder path="0/jdk/src/jdk.crypto.ec">
         <cTool>
           <incDir>
             <pElem>../../jdk/src/java.base/share/native/include</pElem>
             <pElem>../../jdk/src/java.base/solaris/native/include</pElem>
             <pElem>../../jdk/src/java.base/unix/native/include</pElem>
             <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
             <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
-            <pElem>../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11</pElem>
-            <pElem>../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11</pElem>
-            <pElem>../../jdk/src/java.base/solaris/native/libjava</pElem>
-            <pElem>../../build/support/headers/jdk.crypto.cryptoki</pElem>
             <pElem>../../make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>DEBUG</Elem>
-            <Elem>THIS_FILE="j2secmod.c"</Elem>
+            <Elem>MP_API_COMPATIBLE</Elem>
+            <Elem>NSS_ECC_MORE_THAN_SUITE_B</Elem>
+            <Elem>THIS_FILE="ec.c"</Elem>
           </preprocessorList>
         </cTool>
-      </folder>
-      <folder path="0/jdk/src/jdk.crypto.cryptoki/unix">
-        <cTool>
+        <ccTool>
+          <incDir>
+            <pElem>../../make</pElem>
+          </incDir>
           <preprocessorList>
-            <Elem>THIS_FILE="j2secmod_md.c"</Elem>
+            <Elem>DEBUG</Elem>
+            <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
           </preprocessorList>
-        </cTool>
+        </ccTool>
       </folder>
       <folder path="0/jdk/src/jdk.crypto.ucrypto">
         <cTool>
           <incDir>
             <pElem>../../jdk/src/java.base/share/native/include</pElem>
< prev index next >