Use AxParameter library from native SDK (#73)

Co-authored-by: Deepika Shanmugam <92788697+deepikas20@users.noreply.github.com>
Co-authored-by: Madelen Andersson <madelen.andersson@axis.com>

Dockerfile

@@ -10,14 +10,8 @@ ARG VERSION=1.13
 ARG UBUNTU_VERSION=22.04
 ARG NATIVE_SDK=acap-native-sdk
 
-ARG ACAP3_SDK_VERSION=3.5
-ARG ACAP3_UBUNTU_VERSION=20.04
-ARG ACAP3_SDK=acap-sdk
-
 FROM ${REPO}/${NATIVE_SDK}:${VERSION}-${ACAPARCH}-ubuntu${UBUNTU_VERSION} as build_image
 
-FROM ${REPO}/${ACAP3_SDK}:${ACAP3_SDK_VERSION}-${ACAPARCH}-ubuntu${ACAP3_UBUNTU_VERSION} as acap-sdk
-
 FROM build_image AS ps
 ARG PROCPS_VERSION=v3.3.17
 ARG BUILD_DIR=/build
@@ -61,13 +55,6 @@ ARG DOCKER_VERSION
 ARG DOCKER_COMPOSE_VERSION
 ARG ACAPARCH
 
-# Copy over axparameter from the acap-sdk
-COPY --from=acap-sdk /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/include/axsdk/ax_parameter /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/include/axsdk
-COPY --from=acap-sdk /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/libaxparameter.so /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/libaxparameter.so
-COPY --from=acap-sdk /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/libaxparameter.so.1 /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/libaxparameter.so.1
-COPY --from=acap-sdk /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/libaxparameter.so.1.0 /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/libaxparameter.so.1.0
-COPY --from=acap-sdk /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/pkgconfig/axparameter.pc /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/pkgconfig/axparameter.pc
-
 COPY app /opt/app
 COPY --from=ps /export/ps /opt/app
 

app/dockerdwrapperwithcompose.c

@@ -14,7 +14,7 @@
  * under the License.
  */
 
-#include <axsdk/ax_parameter.h>
+#include <axsdk/axparameter.h>
 #include <errno.h>
 #include <glib.h>
 #include <mntent.h>