mirror of
https://github.com/bitwarden/android.git
synced 2024-12-26 19:08:32 +03:00
PM-3349
Added Argon libraries for Android minor change to gitignore so that the Argon x86 lib is not ignored on the Android platform
This commit is contained in:
parent
4bcc7c0d71
commit
174acbc558
6 changed files with 7 additions and 0 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -31,6 +31,7 @@ Components/
|
||||||
x64/
|
x64/
|
||||||
x86/
|
x86/
|
||||||
!src/lib/x86/
|
!src/lib/x86/
|
||||||
|
!src/App/Platforms/Android/lib/x86/
|
||||||
build/
|
build/
|
||||||
bld/
|
bld/
|
||||||
[Bb]in/
|
[Bb]in/
|
||||||
|
|
|
@ -64,6 +64,12 @@
|
||||||
<CreatePackage>false</CreatePackage>
|
<CreatePackage>false</CreatePackage>
|
||||||
<MtouchExtraArgs>-gcc_flags "-L$(ProjectDir)../../lib/ios -largon2 -force_load $(ProjectDir)../../lib/ios/libargon2.a"</MtouchExtraArgs>
|
<MtouchExtraArgs>-gcc_flags "-L$(ProjectDir)../../lib/ios -largon2 -force_load $(ProjectDir)../../lib/ios/libargon2.a"</MtouchExtraArgs>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<AndroidNativeLibrary Include="Platforms\Android\lib\arm64-v8a\libargon2.so" />
|
||||||
|
<AndroidNativeLibrary Include="Platforms\Android\lib\armeabi-v7a\libargon2.so" />
|
||||||
|
<AndroidNativeLibrary Include="Platforms\Android\lib\x86\libargon2.so" />
|
||||||
|
<AndroidNativeLibrary Include="Platforms\Android\lib\x86_64\libargon2.so" />
|
||||||
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
|
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
|
||||||
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
|
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
|
||||||
|
|
BIN
src/App/Platforms/Android/lib/arm64-v8a/libargon2.so
Normal file
BIN
src/App/Platforms/Android/lib/arm64-v8a/libargon2.so
Normal file
Binary file not shown.
BIN
src/App/Platforms/Android/lib/armeabi-v7a/libargon2.so
Normal file
BIN
src/App/Platforms/Android/lib/armeabi-v7a/libargon2.so
Normal file
Binary file not shown.
BIN
src/App/Platforms/Android/lib/x86/libargon2.so
Normal file
BIN
src/App/Platforms/Android/lib/x86/libargon2.so
Normal file
Binary file not shown.
BIN
src/App/Platforms/Android/lib/x86_64/libargon2.so
Normal file
BIN
src/App/Platforms/Android/lib/x86_64/libargon2.so
Normal file
Binary file not shown.
Loading…
Reference in a new issue