commit 200fcc9565814288bd2cfe7c81620b6dea3a75d7
author Mahesh Sharma <smahesh@codeaurora.org> Wed Jul 31 15:22:39 2019 -0700
committer Mahesh Kumar Sharma <smahesh@codeaurora.org> Wed Jul 31 15:25:16 2019 -0700
tree 5e659a64b5a8547728092854e2d87fdfada68d87
parent e23ee25163bf7b3f7f2ecab3a89f5a48ff87e171
parent 674e8d9b3f67f0fc599116fa4e2efcc1c3d10947

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

Change-Id:  I6c6b3d4a56e7fb1b347de7def9818d37fb20ee80

Android.mk

diff --git a/Android.mk b/Android.mk
index 2169f06..092ffb7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -34,7 +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
 include $(BUILD_PACKAGE)
 
 endif # BOARD_ANT_WIRELESS_DEVICE defined

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)
         {