From d818e486f9fb668b852443fa2f1f846677bbea40 Mon Sep 17 00:00:00 2001 From: Jorge Saldivar Date: Thu, 30 Nov 2023 20:50:16 +0000 Subject: Expose libcrypto_static to adservices & extservices Bug: 308651557 AdServices uses libcrypto to access HPKE. ExtServices uses AdServices to enable backward compatibility with Android 30, 31, and 32. Encryption works in versions 31 and later, but fails in version 30. The libcrypto.so file located in /system/lib64 does not have HPKE until version 31. The issue can be resolved by using libcrypto_static, so the library could be packaged within the APK. Test: mma Change-Id: I371500ee792a23c74431cd3ab57d05def26ac093 --- Android.bp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Android.bp b/Android.bp index f00dff93..278d85ab 100644 --- a/Android.bp +++ b/Android.bp @@ -364,6 +364,7 @@ cc_library_static { "//hardware/interfaces/keymaster/4.0/vts/functional", "//hardware/interfaces/keymaster/4.1/vts/functional", "//packages/modules/adb", + "//packages/modules/AdServices:__subpackages__", "//packages/modules/DnsResolver/tests:__subpackages__", "//packages/modules/NeuralNetworks:__subpackages__", "//system/core/init", @@ -378,6 +379,8 @@ cc_library_static { min_sdk_version: "29", apex_available: [ "//apex_available:platform", + "com.android.adservices", + "com.android.extservices", "com.android.neuralnetworks", ], defaults: [ -- cgit v1.2.3