From 0550aa4e9894bf06ea4f57da48a0446e41993dc7 Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Sun, 22 Oct 2023 18:07:23 +0000 Subject: [PATCH] Oh for crying out loud. Android started disallowing executing files from the private data directory in SDK 29. git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4571 ed5197a5-7fde-0310-b194-c3ffbd925b24 --- Makefile | 2 +- .../arm64-v8a/usr/local/lib/libcrypto.a | Bin 10055890 -> 10055858 bytes .../android/x86_64/usr/local/lib/libcrypto.a | Bin 9493328 -> 9493312 bytes src/android/AndroidManifest.xml | 2 +- tools/ssl-android | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index be2810b6..1de34732 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ ANDROID_BUILD_TOOLS := $(ANDROID_SDK)/build-tools/34.0.0 ANDROID_PLATFORM := $(ANDROID_SDK)/platforms/android-33 ANDROID_NDK ?= $(ANDROID_SDK)/ndk/26.0.10792818 ANDROID_MIN_SDK_VERSION := 24 -ANDROID_TARGET_SDK_VERSION := 34 +ANDROID_TARGET_SDK_VERSION := 28 ANDROID_ARMV7A_TARGETS := \ out/androiddebug-armv7a/tildefriends \ diff --git a/deps/openssl/android/arm64-v8a/usr/local/lib/libcrypto.a b/deps/openssl/android/arm64-v8a/usr/local/lib/libcrypto.a index 4863e40d21584cafae8696e1cac2836fd6a58d26..8d74ac96307cb95a029c51b5ed8e4ee10e6b52b4 100644 GIT binary patch delta 10018 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 DkJgco delta 10019 zcmc)O3sh8f8UXO`-V4JW7;!|MxuG&ZMrk@B`J9xL3SDx^(5TSVk}gEN8@(FW!wl;#2XUUTV31d4+(#zd%Zqsg#?H1-oCPq z3P_O7ABF@M5_PT6W$r0R>=kQ*#9n#6kT@8vEF=y<8tA4w?md!U4+D?}y7?R2lLp)! zJkriyszV1!V_V%r8cL$AMo4ny`7lUw_WCJE8YF2jfsYC&;VO|XO>CJ7k6uN|nhfaT z9}da>^!-on>hx=8#6a?IL2?wy47uouJ&-(9uh8auHJKpUmCs8d*#)WpWXk9$xT1TE zkW%D5I6K23#o57NNV!P5IA~EpN`K$hL5h=9&zay}(jXH)b_P-ha`Z5yI{T~!QU^mC zASg{202fS)g0x=qJ0Q(Xq$?)+TQH=3+U8d2eihI|>h1hCZCoUz_aXJ4pm8eg&XxRH zNZ%UgUeZ7bUx|hEt4zAu1+I{v-v6(B!nJdnVfZ8$iQw?JmE(>lm>k_CGpi}!UC$z6$tnMZQllMHVI(q)hGP#t7l&Rfxt zR!!@52sn&@aB zw!8onxHM%ZGDD?PDBLl@V~LL^*O@0-9ZIWDgJvmMM%Bq0u@iP0b}i2y07voEO*q}}FA zz0(TP35xxm*8JNHg`UBekP64eLKkBm6kbl05ef%V6b6L@d0{0Kx?-=BpsOMP16LGdg$?mhupz%4Hf*JKS9m}4|34Qd&nLl#0c>1U3LE2M+)El_!lLW| zC@P8S*02(aTEe=0+XhAdX&EwUIE&o4MjG;t-B_GzOG7`hp=@CDP8qt`gJH9?)4s6T zLF(-c&_21Z1}^Jh8$3yWI~HGG+HGM46!%I#0mTllB|-7ISSYzM4@w?1L&?KYP=X;) z@}3=}l1?i)Y?;3Ywye#8EeBg*%clWdw#K%?)&qOHl$K_IvofC?=wn$~$vlTTn}1bF8rK*RVFjw)PIFm>35YtJ|Pr zQv_7lQu~o;;)6)2oDcz(3GLmgsPF7AO;DA55~}L0Q1#ORuxMw3<;IPDEvp5KvlM@@ zIJ0zs#aVq4SRAC@PH%hq1Xx_Kjxm8XC*yDJefcOh=Bx>AQDWjB@@YYB!pZ~ZXlD$ zWO5^!LZ%WUxrv05X(Wu?Os10=WG0zKW|KL@L~bE-$vhHHZYA@{0un)PBe#<~NTe+* zdtriM^s>b4z`NFD1x}k27#3=xKhtO6sj7tvGuvjjEc9lW**L9}|G?5YelD&IRFB_u z1{ab=B+({Ob-;-!^7g<8?CNX3wSw`+5vE*KIAGx2zk>z9sd4Q}WtH^5dAbE(a zA@Ss4+Zhy>a(G?Df@x@sFXPetl(>lfLWOTUCFbx9KzR_rHe1vV@fhdvC1;py3*IeO zGhJP5dRi>7h3^sL8H`*SA)x&k@fFs@E)9-9c>?hlMm| zp2Rk=K-6smn60}i-e*mpxU~Kndy585*Q?rfFiyaIeKkFf& zx7kO)w#Q}&SUfpIz?xBI0w#Hn7ubdLERPl#F>m%%0rQf_3+P`RdJV%_UlfgKI_xj7 zU$OY^B()CPjFczZpcU}#;H3iAO$(+J`zTq`yCW&%HxJN-RSRgE>MdYo)jR=HLsJAi zjx=Z9aIJtR5BgGh9rgUPX<0__Gy!X$s}!(3iKp84Qk;FkLIHON8h9+-<#Pk>aP*>Y zFiywleC-%p(@Ua;L3@L!!Ba1;;4!jM)Z(dn@y%=EE<8OzZcpEFo^kkogII*7T^<^& znMws#uAiV`zQa}Zq8@7;vnQWbY0zw$$79oEBNcmj7LSelDQ|59_1Y&JwP<$CnQn>G zU`xX+4LgRxbR4b6p3l+5dm!)3#(pf$Tix=kz>QKM# z7a5AXo|$XF#&rn-8YYB!;naUoNCyqot1pBYo~018Z<@fy1HLx*<`A5$jHWX7n|Z7~ z5*~>DCA`4yU@&l`M+nBz0N-Z(c;fS@#NIdniTHTeJg-LjN zr>Dz%987i26U+JqqRKOfp4zbqxt`7`^67~^!!|n?$R#p>(~`NdnEKf$6$UQV2D3X@ z{NgQMkGq~);fb&C4+LY<*O>wu7tQ9`j{sM{I5&Wu&f#l+^3mh@&WT?1Ygbl8SxJzU zL|J)6R+41pQCUfrl@wV?m6bGENtczivXUVynX-~4E7`J=BP)-|O0KM|la)MK$(NM^ zSy?YDW?7MBrBGHj$jU}pDUy}PW#tK3k!59*tZbH*CuOBrR!U@Li>z#wl~P$Lla+E= a*(NI$vQjB4RkC7{6|1aZqf&j~x&HwVqJmoh diff --git a/deps/openssl/android/x86_64/usr/local/lib/libcrypto.a b/deps/openssl/android/x86_64/usr/local/lib/libcrypto.a index 8bbfc53d22c5e5636f786fd715907ce0e5abd0f6..d1741b9ac293e67bb185358a6ef3fc9e27d18566 100644 GIT binary patch delta 10378 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 diff --git a/src/android/AndroidManifest.xml b/src/android/AndroidManifest.xml index 19a783a8..34378399 100644 --- a/src/android/AndroidManifest.xml +++ b/src/android/AndroidManifest.xml @@ -3,7 +3,7 @@ package="com.unprompted.tildefriends" android:versionCode="12" android:versionName="0.0.12-wip"> - + diff --git a/tools/ssl-android b/tools/ssl-android index 84ec7c6a..bfc1f709 100755 --- a/tools/ssl-android +++ b/tools/ssl-android @@ -3,7 +3,7 @@ ANDROID_NDK=~/Android/Sdk/ndk/23.1.7779620 OPENSSL_VERSION=3.1.3 -API_LEVEL=28 +API_LEVEL=24 BUILD_DIR=out/openssl_android_build