commit 6b3d142c5609fb08276ea0a5033145b1c1ae3110
author Mahesh Sharma <smahesh@codeaurora.org> Mon Jan 20 12:08:35 2020 -0800
committer Mahesh Kumar Sharma <smahesh@codeaurora.org> Mon Jan 20 13:26:47 2020 -0800
tree 60f0a58f17841a752efb59fce0d5ba0aad6e5c14
parent 200fcc9565814288bd2cfe7c81620b6dea3a75d7
parent db1d34c2d315f78cc8f01b31956e020da343082c

Merge remote-tracking branch 'remotes/origin/caf/github/production/4.0.x'into ant.lnx.3.0

Change-Id: I80fe85126605733f3df42c6638b4f427d883a827

Android.mk

diff --git a/Android.mk b/Android.mk
index ed0adc5..e86b5c1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -34,6 +34,9 @@
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := AntHalService
+ifeq ($(filter 8% O% o%,$(TARGET_PLATFORM_VERSION)),)
+LOCAL_SDK_VERSION := system_current
+endif
 LOCAL_SYSTEM_EXT_MODULE := true
 
 include $(BUILD_PACKAGE)

src/com/dsi/ant/core/JAntJava.java

diff --git a/src/com/dsi/ant/core/JAntJava.java b/src/com/dsi/ant/core/JAntJava.java
index 836f320..2229418 100644
--- a/src/com/dsi/ant/core/JAntJava.java
+++ b/src/com/dsi/ant/core/JAntJava.java
@@ -36,7 +36,7 @@
     {
         try
         {
-            System.load("libantradio.so");
+            System.loadLibrary("antradio");
         }
         catch (Exception e)
         {