dvb: do not install libam_sysfs.so when sdk >= 26 [1/1]

PD# NONE

Change-Id: I97210053b903e19cb169ca8b9e54fdb8e1981d29

4 files changed, 10 insertions, 15 deletions

diff --git a/Android.mk b/Android.mk
index 45fabe8..e0d6687 100644
--- a/Android.mk
+++ b/Android.mk
@@ -62,6 +62,7 @@ LOCAL_SRC_FILES := $(LIB32_PATH)libam_ver.so
 endif
 include $(BUILD_PREBUILT)
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 26 && echo OK),OK)
 include $(CLEAR_VARS)
 LOCAL_MODULE := libam_sysfs
 LOCAL_MODULE_SUFFIX :=.so
@@ -74,20 +75,14 @@ LOCAL_MULTILIB := $(multilib)
 LOCAL_SRC_FILES_64 := lib64/libam_sysfs.so
 LOCAL_SRC_FILES_32 := $(LIB32_PATH)libam_sysfs.so
 
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
-LOCAL_PROPRIETARY_MODULE := true
-LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
-LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
-else
 LOCAL_MODULE_PATH_64 := $(TARGET_OUT)/lib64
 LOCAL_MODULE_PATH_32 := $(TARGET_OUT)/lib
-endif
-
 else
 LOCAL_MODULE_PATH := $(TARGET_OUT)/lib
 LOCAL_SRC_FILES := $(LIB32_PATH)libam_sysfs.so
 endif
 include $(BUILD_PREBUILT)
+endif
 
 include $(CLEAR_VARS)
 include $(LOCAL_PATH)/am_adp/Android.mk
diff --git a/lib32/libam_ver.so b/lib32/libam_ver.so
index 5ab986a..b8194a0 100755
--- a/lib32/libam_ver.so
+++ b/lib32/libam_ver.so
@@ -1,7 +1,7 @@
-ELF



+ELF



 

 
-0�3�/��K�
+0�3�/��K�
 ��
	 �)$܀)6А)OР)@��
 �
"
1O�@
 �
@@ -91,8 +91,8 @@ B�&��
 
 
 ������:������8������N�����X������x�������������������������4����
-�����������������

+�����������������

 
 
 A
	
-



"
&
D
libam_ver.so
+



"
&
D
libam_ver.so
diff --git a/lib64/libam_ver.so b/lib64/libam_ver.so
index c5e0ecc..25070cd 100755
--- a/lib64/libam_ver.so
+++ b/lib64/libam_ver.so
@@ -1,2 +1,2 @@
-ELF


-
+ELF


+
diff --git a/libam_ver.so b/libam_ver.so
index 0ae32e4..fd67b28 100755
--- a/libam_ver.so
+++ b/libam_ver.so
@@ -1,6 +1,6 @@
 ELF



 
-0�3�/��K�
+0�3�/��K�
 
 A
	
-



"
D
libam_ver.so
+



"
D
libam_ver.so