|
48 | 48 | <boringsslRepository>https://boringssl.googlesource.com/boringssl</boringsslRepository> |
49 | 49 | <!-- Lets use what we use in netty-tcnative-boringssl-static --> |
50 | 50 | <boringsslBranch>main</boringsslBranch> |
51 | | - <boringsslCommitSha>b8c97f5b4bc5d4758612a0430e5c2792d0f9ca7f</boringsslCommitSha> |
| 51 | + <boringsslCommitSha>0226f30467f540a3f62ef48d453f93927da199b6</boringsslCommitSha> |
52 | 52 |
|
53 | 53 | <generatedSourcesDir>${project.build.directory}/generated-sources</generatedSourcesDir> |
54 | 54 | <templateDir>${project.build.directory}/template</templateDir> |
|
74 | 74 | </os> |
75 | 75 | </activation> |
76 | 76 | <properties> |
77 | | - <macosxDeploymentTarget>10.12</macosxDeploymentTarget> |
| 77 | + <macosxDeploymentTarget>10.13</macosxDeploymentTarget> |
78 | 78 | <!-- On *nix, add ASM flags to disable executable stack --> |
79 | 79 | <cmakeAsmFlags>-Wa,--noexecstack -mmacosx-version-min=${macosxDeploymentTarget}</cmakeAsmFlags> |
80 | 80 | <extraCflags>-mmacosx-version-min=${macosxDeploymentTarget}</extraCflags> |
|
93 | 93 | <jniLibName>netty_incubator_codec_ohttp_hpke_boringssl_osx_aarch_64</jniLibName> |
94 | 94 | <jni.classifier>osx-aarch_64</jni.classifier> |
95 | 95 | <javaModuleNameClassifier>osx.aarch_64</javaModuleNameClassifier> |
96 | | - <macosxDeploymentTarget>11.0</macosxDeploymentTarget> |
| 96 | + <macosxDeploymentTarget>13.0</macosxDeploymentTarget> |
97 | 97 | <extraCflags>-target arm64-apple-macos11</extraCflags> |
98 | 98 | <extraCxxflags>-target arm64-apple-macos11</extraCxxflags> |
99 | 99 | <!-- On *nix, add ASM flags to disable executable stack --> |
|
118 | 118 | <jniLibName>netty_incubator_codec_ohttp_hpke_boringssl_osx_x86_64</jniLibName> |
119 | 119 | <jni.classifier>osx-x86_64</jni.classifier> |
120 | 120 | <javaModuleNameClassifier>osx.x86_64</javaModuleNameClassifier> |
121 | | - <macosxDeploymentTarget>10.12</macosxDeploymentTarget> |
| 121 | + <macosxDeploymentTarget>10.13</macosxDeploymentTarget> |
122 | 122 | <extraCflags>-target x86_64-apple-macos10.12 -mmacosx-version-min=${macosxDeploymentTarget}</extraCflags> |
123 | 123 | <extraCxxflags>-target x86_64-apple-macos10.12</extraCxxflags> |
124 | 124 | <!-- On *nix, add ASM flags to disable executable stack --> |
|
313 | 313 |
|
314 | 314 | <!-- Only copy the libs and header files we need --> |
315 | 315 | <mkdir dir="${boringsslHomeBuildDir}" /> |
316 | | - <copy file="${boringsslBuildDir}/crypto/${libcrypto}" todir="${boringsslHomeBuildDir}" verbose="true" /> |
| 316 | + <copy file="${boringsslBuildDir}/${libcrypto}" todir="${boringsslHomeBuildDir}" verbose="true" /> |
317 | 317 | <copy todir="${boringsslHomeIncludeDir}" verbose="true"> |
318 | 318 | <fileset dir="${boringsslSourceDir}/include" /> |
319 | 319 | </copy> |
|
0 commit comments