Fix compilation failure for AIDL Hal transport To adapt common transport to use either AIDL(OMAPI) or HAL-to-HAL Bug: 345692360 Test: Build ok, Weaver vts Change-Id: I50db016dcb9591ca2d24c5978275595d3f57ad98
diff --git a/libese_weaver/Android.bp b/libese_weaver/Android.bp index 4776e81..a7018b0 100644 --- a/libese_weaver/Android.bp +++ b/libese_weaver/Android.bp
@@ -45,6 +45,7 @@ ], shared_libs: [ + "android.hardware.secure_element-V1-ndk", "android.se.omapi-V1-ndk", "libcutils", "libjc_keymint_transport.nxp",
diff --git a/libese_weaver/inc/TransportFactory.h b/libese_weaver/inc/TransportFactory.h index 416f6d5..4554349 100644 --- a/libese_weaver/inc/TransportFactory.h +++ b/libese_weaver/inc/TransportFactory.h
@@ -30,24 +30,28 @@ ** See the License for the specific language governing permissions and ** limitations under the License. ** - ** Copyright 2020-2023 NXP + ** Copyright 2020-2024 NXP ** *********************************************************************************/ #ifndef __SE_TRANSPORT_FACTORY__ #define __SE_TRANSPORT_FACTORY__ -#include "HalToHalTransport.h" +#ifdef OMAPI_TRANSPORT #include "OmapiTransport.h" +#else +#include "HalToHalTransport.h" +#endif #include "SocketTransport.h" namespace se_transport { -using keymint::javacard::HalToHalTransport; using keymint::javacard::ITransport; using keymint::javacard::SocketTransport; #ifdef OMAPI_TRANSPORT using keymint::javacard::OmapiTransport; +#else +using keymint::javacard::HalToHalTransport; #endif /**