Merge "dvb: copy so to vendor when sdk > 26 [1/1]" into tv-arch-next

16 files changed, 171 insertions, 82 deletions

diff --git a/Android.mk b/Android.mk
index d846e30..45fabe8 100755..100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,12 +14,21 @@ LOCAL_MODULE_SUFFIX :=.so
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_TAGS := optional
 LOCAL_PRELINK_MODULE := false
+
 ifdef TARGET_2ND_ARCH
 LOCAL_MULTILIB := $(multilib)
-LOCAL_MODULE_PATH_64 := $(TARGET_OUT)/lib64
 LOCAL_SRC_FILES_64 := lib64/libam_mw.so
-LOCAL_MODULE_PATH_32 := $(TARGET_OUT)/lib
 LOCAL_SRC_FILES_32 := $(LIB32_PATH)libam_mw.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_mw.so
@@ -32,12 +41,21 @@ LOCAL_MODULE_SUFFIX :=.so
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_TAGS := optional
 LOCAL_PRELINK_MODULE := false
+
 ifdef TARGET_2ND_ARCH
 LOCAL_MULTILIB := $(multilib)
-LOCAL_MODULE_PATH_64 := $(TARGET_OUT)/lib64
 LOCAL_SRC_FILES_64 := lib64/libam_ver.so
-LOCAL_MODULE_PATH_32 := $(TARGET_OUT)/lib
 LOCAL_SRC_FILES_32 := $(LIB32_PATH)libam_ver.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_ver.so
@@ -50,12 +68,21 @@ LOCAL_MODULE_SUFFIX :=.so
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_TAGS := optional
 LOCAL_PRELINK_MODULE := false
+
 ifdef TARGET_2ND_ARCH
 LOCAL_MULTILIB := $(multilib)
-LOCAL_MODULE_PATH_64 := $(TARGET_OUT)/lib64
 LOCAL_SRC_FILES_64 := lib64/libam_sysfs.so
-LOCAL_MODULE_PATH_32 := $(TARGET_OUT)/lib
 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
diff --git a/am_adp/Android.mk b/am_adp/Android.mk
index 128b455..4e40deb 100644
--- a/am_adp/Android.mk
+++ b/am_adp/Android.mk
@@ -147,6 +147,10 @@ LOCAL_SHARED_LIBRARIES+=$(AMADEC_LIBS) libcutils liblog libdl libc
 
 LOCAL_PRELINK_MODULE := false
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 #LOCAL_32_BIT_ONLY := true
 
 include $(BUILD_SHARED_LIBRARY)
@@ -292,6 +296,10 @@ LOCAL_PRELINK_MODULE := false
 
 #LOCAL_32_BIT_ONLY := true
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_STATIC_LIBRARY)
 
 
diff --git a/am_adp/am_open_lib/am_ci/libdvbapi/Android.mk b/am_adp/am_open_lib/am_ci/libdvbapi/Android.mk
index 4a54591..4ded138 100644
--- a/am_adp/am_open_lib/am_ci/libdvbapi/Android.mk
+++ b/am_adp/am_open_lib/am_ci/libdvbapi/Android.mk
@@ -14,5 +14,9 @@ LOCAL_SHARED_LIBRARIES += liblog libc
 
 LOCAL_PRELINK_MODULE := false
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_STATIC_LIBRARY)
 
diff --git a/am_adp/am_open_lib/am_ci/libdvben50221/Android.mk b/am_adp/am_open_lib/am_ci/libdvben50221/Android.mk
index dae280c..88972de 100644
--- a/am_adp/am_open_lib/am_ci/libdvben50221/Android.mk
+++ b/am_adp/am_open_lib/am_ci/libdvben50221/Android.mk
@@ -31,5 +31,9 @@ LOCAL_SHARED_LIBRARIES += liblog libc
 
 LOCAL_PRELINK_MODULE := false
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_STATIC_LIBRARY)
 
diff --git a/lib32/libam_sysfs.so b/lib32/libam_sysfs.so
index 4011b68..7edbabd 100755
--- a/lib32/libam_sysfs.so
+++ b/lib32/libam_sysfs.so
@@ -1,68 +1,56 @@
-ELF



-
-
-0�3�/��K�
-
-�L��P�����
`��
-
-
-
-
-
-
-
-���
-
-
-���
-
-�� ��;�/�
-
-
-���
-
-�����
-��
	 �)$܀)6А)OР)@��
-�
"
1O�@
-�
-6���
-�
A�
-�
-�
-
-
-�xD
-�!F
-(Fo�

BF
-H���xD
-�
 GpG��F
-� h)F2Fi F�G���?�
-�N�re���u� h
-�-�
-	����?��D
-��
-p���J
-�����O�T
��
- Fo�

�G
 ���
-���p
-�	���bh^h��
-B�&��
-�xD
-
-
-






��dxDpG���p($���� 
-
�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG�HxDpG}HxDpG{HxDpGxHxDpGvHxDpGsHxDpGqHxDpGnHxDpGlHxDpGiHxDpGgHxDpGdHxDpGbHxDpG_HxDpG]HxDpGZHxDpGXHxDpGUHxDpGSHxDpGPHxDpGMHxDpGJHxDpGHHxDpGEHxDpGCHxDpG@HxDpG>HxDpG;HxDpG9HxDpG6HxDpG4HxDpG1HxDpG/HxDpG,HxDpG*HxDpG'HxDpG%HxDpG"HxDpG HxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpGHxDpG	HxDpGHxDpGHxDpGHxDpG
-

-�H����������������

-
-
-
-
-
+ELF



+
+
+0�3�/��K�
+
+
 D�
+
+
`��
��
0��
+
+�
+��
+6��A�
+�
HFBF
+�
 "O�@
+��
+p�
+�
+�� -��0F)F"F
+IKzD
+�� ,��2h(F!F
+I
+KzD
+�F�
+� F��P� F��T���X�
+�
+�nF�c�
+�
+�"F
+ Fo�

BF
+K��
+�
 GpG��F
+��p@�
+ F��|Q��xQ���Q��
+�N�re���u� h
+�
)�	���J�D0�<0�@0�)�
+I
+KzD
+�)�dpG
)����K�BdpG�cpG)��
+IKzD
+IKzD
+IKzD
+
+ Fo�

�G
 ���
+�Xhbh����
+"
+
+
 A
	
-



"
&
D
libam_sysfs.so
-
-
-
-
-
-
+



"
&
D
�7zXZ
+{�fyv��
���4�K&����z݊��{��oNҒ1�Z���9�;�d;�L�QV�2�M)2.���l��8����Ž��J�C	@\����G��}�OPjv�_}���Ck9Ӛ剱�) �a��#�c�;�U6L����i)�
2�mDV�^tM	�>�λ0n��Z��4�@��DF��Q~a�u���m��~�o�*#
�՘��(��[�T9������A&J�,m�UV��e��p�ݕ��
+;0�e1_�C�����\^��W�
+jGҌ�����>~7M�� ��_�ހZ�</�VZ`M�i���T/�q�	%�)�d�2��9!��f��ś�����ZhJ�wIrE�Ь������N�8I
��u����0�'��
+��"���1=�&���P���IQPg���
+R�{l����R)�cXR\ipE��p�Nj/K�V��e��KRF�zh&� lƞ��[ӈ�bl��)%�v��w�{[�Kh��a�%:�i7lo���w�w�Z�����w��z�b-��`�9�y�ϔ��:�s1-|�W�����yjNo��,c
+3��\l��)�}�)C�/숉���p�)sv��� E�p��n�d@(/��,��|D Q��2tKs�a��r�Th�ʰ��˰�Yr��
h��T{���,��
+q��gO�s���Rw3wA�1�f��`@Il֮7�3��zZ�ǒ�w׿�b�1�8���3�&�����ݍ��걺����ʯ:Tۻ��9T�@A�x ,|w�6Exf��d��Qچ�V=��A9��ؑc�I|��;]��\�`皞Ͽ��Q�E���d��d���66R�oP�<Ǎ�7�Z�p��C/�Y�W��p�-�|Ƃ2|�yN����_���~�"RD��rbm�FS����l��O�
=�N�������ID��4���J;���5\%��u?BR�p�$H�DJ��LR�;!y61�Hǧt7���̏�+!p�b$z�|�^7f��1V���s���r��)Ң��;g��!�ё-��p� �Jm�5,~#���v
^u�S��9]���r/h�bb�l�Cy�rJ~��(�|zj�?8�`��2IZ�B�<�'����HO��a�j���w]��Mnܭr9��i�CW{�Ƞ�X��<V:1bB�d7L�E���w]�U��V���N�!�2�w�nZZ� Z�o^���_U��iJ7�s�.��g��z�KE^Y�m�����+O��蹃O;��[|O#
9%�i4�1��}`@��/��GG��_�0M��𡽳x�_Ȧ����m3�\�s��S�'uJm:�;�Gʯc�ʂ6�cM��p��{}���
þA��!�J�{�r���>\�֒tl�q��5�� f:�Y�����M�3�m����v�S���sz�6�cqħ�۩0���3��J���S��/�,��
�J�tF̳�}��
diff --git a/lib64/libam_sysfs.so b/lib64/libam_sysfs.so
index abfbf68..1404cfd 100755
--- a/lib64/libam_sysfs.so
+++ b/lib64/libam_sysfs.so
@@ -1,9 +1,11 @@
-ELF


-
-
-���
-�����
-���
-���
-�
-
+ELF


+
+
+�
+
+�
+��
+
+MH�&L�J�B䬽w3�/sl�⟄�'�G�L���7���D��?�4V5�'t��ޯ���
+0�8�����cN9�#�
.GId�c����t/���<�e���u>�����	�o�q0���;l�U�p
��\c3EC/R;��&���_�M�a���(����L�`BE���M�hc�ո�yȄ���$P����k����S�wi9�2�����g���!�F,uu�O'�X�-���&
+�5��Е�b"�|Ε�
diff --git a/test/am_av_test/Android.mk b/test/am_av_test/Android.mk
index 7e8bd6f..b479305 100644
--- a/test/am_av_test/Android.mk
+++ b/test/am_av_test/Android.mk
@@ -22,6 +22,10 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../include/am_adp $(LOCAL_PATH)/../../andro
 LOCAL_SHARED_LIBRARIES := libam_adp libamplayer libcutils liblog libdl libc
 LOCAL_32_BIT_ONLY := true
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
@@ -34,5 +38,9 @@ LOCAL_STATIC_LIBRARIES :=#
 LOCAL_SHARED_LIBRARIES :=libcutils liblog libc
 LOCAL_32_BIT_ONLY := true
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_EXECUTABLE)
 
diff --git a/test/am_dmx_test/Android.mk b/test/am_dmx_test/Android.mk
index 402baa7..edccd8d 100644
--- a/test/am_dmx_test/Android.mk
+++ b/test/am_dmx_test/Android.mk
@@ -15,4 +15,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../include/am_adp $(LOCAL_PATH)/../../andro
 LOCAL_SHARED_LIBRARIES := libam_adp liblog libdl libc
 LOCAL_32_BIT_ONLY := true
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_EXECUTABLE)
diff --git a/test/am_dsc_test/Android.mk b/test/am_dsc_test/Android.mk
index efc5e3e..8846a63 100644
--- a/test/am_dsc_test/Android.mk
+++ b/test/am_dsc_test/Android.mk
@@ -19,6 +19,10 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../include/am_adp $(LOCAL_PATH)/../../andro
 LOCAL_SHARED_LIBRARIES := libam_adp libamplayer libcutils liblog libdl libc
 LOCAL_32_BIT_ONLY := true
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
@@ -31,5 +35,9 @@ LOCAL_C_INCLUDES :=$(LOCAL_PATH)/../../include/am_adp $(LOCAL_PATH)/../../androi
 LOCAL_SHARED_LIBRARIES := libam_adp libcutils liblog libdl libc
 LOCAL_32_BIT_ONLY := true
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_EXECUTABLE)
 
diff --git a/test/am_dvr_test/Android.mk b/test/am_dvr_test/Android.mk
index 78fbf2e..f732334 100644
--- a/test/am_dvr_test/Android.mk
+++ b/test/am_dvr_test/Android.mk
@@ -17,6 +17,10 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../include/am_adp $(LOCAL_PATH)/../../andro
 LOCAL_SHARED_LIBRARIES := libam_adp libamplayer libcutils liblog libc libdl
 LOCAL_32_BIT_ONLY := true
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
@@ -36,6 +40,10 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../include/am_adp $(LOCAL_PATH)/../../andro
 LOCAL_SHARED_LIBRARIES := libam_adp libamplayer libcutils liblog libc libdl
 LOCAL_32_BIT_ONLY := true
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
@@ -55,6 +63,10 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../include/am_adp $(LOCAL_PATH)/../../andro
 LOCAL_SHARED_LIBRARIES := libam_adp libamplayer libcutils liblog libc libdl
 LOCAL_32_BIT_ONLY := true
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_EXECUTABLE)
 
 
diff --git a/test/am_epg_test/Android.mk b/test/am_epg_test/Android.mk
index e82c7e8..e279f3f 100755..100644
--- a/test/am_epg_test/Android.mk
+++ b/test/am_epg_test/Android.mk
@@ -23,5 +23,9 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../include/am_adp $(LOCAL_PATH)/../../andro
 LOCAL_SHARED_LIBRARIES += libam_mw libam_adp libdl libicuuc libzvbi libsqlite libamplayer libcutils liblog libc
 LOCAL_32_BIT_ONLY := true
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_EXECUTABLE)
 
diff --git a/test/am_fend_test/Android.mk b/test/am_fend_test/Android.mk
index 004a370..c75cc7e 100644
--- a/test/am_fend_test/Android.mk
+++ b/test/am_fend_test/Android.mk
@@ -15,5 +15,9 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../include/am_adp $(LOCAL_PATH)/../../andro
 LOCAL_SHARED_LIBRARIES := libam_adp liblog libc
 LOCAL_32_BIT_ONLY := true
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_EXECUTABLE)
 
diff --git a/test/am_scan_test/Android.mk b/test/am_scan_test/Android.mk
index e5c4aee..e252f79 100644
--- a/test/am_scan_test/Android.mk
+++ b/test/am_scan_test/Android.mk
@@ -23,5 +23,9 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../include/am_adp $(LOCAL_PATH)/../../andro
 LOCAL_SHARED_LIBRARIES += libicuuc libzvbi libam_adp libsqlite libamplayer liblog libc	libam_adp libam_mw
 LOCAL_32_BIT_ONLY := true
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_EXECUTABLE)
 
diff --git a/test/am_smc_test/Android.mk b/test/am_smc_test/Android.mk
index 441a6b5..dab16cc 100644
--- a/test/am_smc_test/Android.mk
+++ b/test/am_smc_test/Android.mk
@@ -15,4 +15,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../include/am_adp $(LOCAL_PATH)/../../andro
 LOCAL_SHARED_LIBRARIES := libam_adp liblog libc
 LOCAL_32_BIT_ONLY := true
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_EXECUTABLE)
diff --git a/test/am_upd_test/Android.mk b/test/am_upd_test/Android.mk
index ac8dda2..c50fde7 100644
--- a/test/am_upd_test/Android.mk
+++ b/test/am_upd_test/Android.mk
@@ -17,6 +17,10 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../include/am_adp \
 LOCAL_SHARED_LIBRARIES := libam_mw libam_adp liblog libc
 LOCAL_32_BIT_ONLY := true
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 LOCAL_LDFLAGS += -ldl
 
 include $(BUILD_EXECUTABLE)
diff --git a/test/am_userdata_test/Android.mk b/test/am_userdata_test/Android.mk
index d27c38b..9f869a5 100644
--- a/test/am_userdata_test/Android.mk
+++ b/test/am_userdata_test/Android.mk
@@ -20,4 +20,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../include/am_adp $(LOCAL_PATH)/../../andro
 LOCAL_SHARED_LIBRARIES := libam_adp libamplayer libcutils liblog libc
 LOCAL_32_BIT_ONLY := true
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_EXECUTABLE)