tvinput: add porting tvinput to HIDL architecture [2/12]

PD# 157786

need use hwbinder instead of binder for RPC since from O

Change-Id: Ib717a828a72e58dbd89b706890bc3e795705ff00

6 files changed, 43 insertions, 15 deletions

diff --git a/DroidLogicTvInput/Android.mk b/DroidLogicTvInput/Android.mk
index bff4235..656cfb5 100644
--- a/DroidLogicTvInput/Android.mk
+++ b/DroidLogicTvInput/Android.mk
@@ -14,6 +14,10 @@ LOCAL_PROGUARD_ENABLED := disabled
 LOCAL_JAVA_LIBRARIES := droidlogic droidlogic-tv
 LOCAL_JNI_SHARED_LIBRARIES := libjnidtvsubtitle libjnidtvepgscanner libjnifont
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_PACKAGE)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/DroidLogicTvInput/AndroidManifest.xml b/DroidLogicTvInput/AndroidManifest.xml
index 90695c1..cda576b 100644
--- a/DroidLogicTvInput/AndroidManifest.xml
+++ b/DroidLogicTvInput/AndroidManifest.xml
@@ -33,6 +33,8 @@
         android:defaultToDeviceProtectedStorage="true"
         android:directBootAware="true">
 
+        <uses-library android:name="droidlogic.software.core" />
+        <uses-library android:name="droidlogic.tv.software.core" />
         <service
             android:name=".services.Hdmi1InputService"
             android:permission="android.permission.BIND_TV_INPUT" >
diff --git a/DroidLogicTvInput/jni/Android.mk b/DroidLogicTvInput/jni/Android.mk
index 9eab4d1..0b2d463 100644
--- a/DroidLogicTvInput/jni/Android.mk
+++ b/DroidLogicTvInput/jni/Android.mk
@@ -35,6 +35,10 @@ LOCAL_SHARED_LIBRARIES += libjnigraphics libzvbi libam_mw libam_adp libskia libl
 
 LOCAL_PRELINK_MODULE := false
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_SHARED_LIBRARY)
 
 #######################################################################
@@ -56,27 +60,34 @@ LOCAL_SHARED_LIBRARIES += libzvbi libam_mw libam_adp libskia liblog libcutils
 
 LOCAL_PRELINK_MODULE := false
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_SHARED_LIBRARY)
 #######################################################################
 
 include $(CLEAR_VARS)
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+MULTI_FONT_PATH_32 := $(TARGET_OUT_VENDOR)/lib/
+MULTI_FONT_PATH_64 := $(TARGET_OUT_VENDOR)/lib64/
+else
+MULTI_FONT_PATH_32 := $(TARGET_OUT)/lib/
+MULTI_FONT_PATH_64 := $(TARGET_OUT)/lib64/
+endif
+
 LOCAL_MODULE    := libvendorfont
-LOCAL_PRELINK_MODULE := false
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MULTILIB := both
 LOCAL_MODULE_SUFFIX := .so
 LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+
+LOCAL_MODULE_PATH_32 := $(MULTI_FONT_PATH_32)
+LOCAL_MODULE_PATH_64 := $(MULTI_FONT_PATH_64)
+LOCAL_SRC_FILES_arm := arm/$(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
+LOCAL_SRC_FILES_arm64 := arm64/$(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
 
-ifdef TARGET_2ND_ARCH
-LOCAL_MULTILIB := both
-LOCAL_MODULE_PATH_64 := $(TARGET_OUT)/lib64
-LOCAL_SRC_FILES_64 := arm64/libvendorfont.so
-LOCAL_MODULE_PATH_32 := $(TARGET_OUT)/lib
-LOCAL_SRC_FILES_32 := arm/libvendorfont.so
-else
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib
-LOCAL_SRC_FILES := arm/libvendorfont.so
-endif
 include $(BUILD_PREBUILT)
 
 #######################################################################
@@ -96,6 +107,10 @@ LOCAL_SHARED_LIBRARIES += libvendorfont liblog libnativehelper libandroid_runtim
 
 LOCAL_PRELINK_MODULE := false
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_SHARED_LIBRARY)
 
 #######################################################################
diff --git a/DroidLogicTvSource/Android.mk b/DroidLogicTvSource/Android.mk
index 3053f39..3c874f9 100644
--- a/DroidLogicTvSource/Android.mk
+++ b/DroidLogicTvSource/Android.mk
@@ -13,4 +13,8 @@ LOCAL_PROGUARD_ENABLED := disabled
 
 LOCAL_JAVA_LIBRARIES := droidlogic droidlogic-tv
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_PACKAGE)
diff --git a/DroidLogicTvSource/AndroidManifest.xml b/DroidLogicTvSource/AndroidManifest.xml
index 0757417..7cf013e 100644
--- a/DroidLogicTvSource/AndroidManifest.xml
+++ b/DroidLogicTvSource/AndroidManifest.xml
@@ -23,6 +23,8 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen">
+        <uses-library android:name="droidlogic.software.core" />
+        <uses-library android:name="droidlogic.tv.software.core" />
         <activity
             android:name=".DroidLogicTv"
             android:launchMode="singleInstance"
@@ -34,10 +36,10 @@
             </intent-filter>
         </activity>
 
-	    <receiver android:name=".AppointedProgramReceiver" >
+	<receiver android:name=".AppointedProgramReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.tv_appointed_program" />
             </intent-filter>
-	    </receiver>
+	</receiver>
     </application>
 </manifest>
diff --git a/DroidLogicTvSource/src/com/droidlogic/tvsource/ui/SourceInputListLayout.java b/DroidLogicTvSource/src/com/droidlogic/tvsource/ui/SourceInputListLayout.java
index 96b9592..3a0d03d 100644
--- a/DroidLogicTvSource/src/com/droidlogic/tvsource/ui/SourceInputListLayout.java
+++ b/DroidLogicTvSource/src/com/droidlogic/tvsource/ui/SourceInputListLayout.java
@@ -218,10 +218,11 @@ public class SourceInputListLayout extends LinearLayout implements OnSourceClick
             return;
 
         TvControlManager tcm = TvControlManager.getInstance();
-        String prop_ids = tcm.GetSourceInputList();
+        String prop_ids = tcm.getSupportInputDevices();
         if (TextUtils.equals(prop_ids, "null")) {
             throw new IllegalArgumentException("source input ids is not set.");
         }
+
         mSourceInputIds = prop_ids.split(",");
         if (mSourceInputIds == null || mSourceInputIds.length <= 0) {
             throw new NullPointerException("source input ids is empth...");