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 092ffb7..e86b5c1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -37,6 +37,8 @@
 ifeq ($(filter 8% O% o%,$(TARGET_PLATFORM_VERSION)),)
 LOCAL_SDK_VERSION := system_current
 endif
+LOCAL_SYSTEM_EXT_MODULE := true
+
 include $(BUILD_PACKAGE)
 
 endif # BOARD_ANT_WIRELESS_DEVICE defined

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b841d09..dd001f3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,8 +16,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.dsi.ant.server"
-    android:versionName="4.0.1"
-    android:versionCode="040001"
+    android:versionName="4.0.2"
+    android:versionCode="040002"
     android:sharedUserId="android.uid.system">
 
     <uses-sdk