Remove ILoc HIDL impl for S and onwards

ILoc AIDL will replace ILoc HIDL as transport API between system
and vendor partition. Clean out the deprecated HIDL impl

Change-Id: I60d5701520b659eadf50f80335ec93c52a500bf4
CRs-Fixed: 3085310

11 files changed, 0 insertions, 93 deletions

diff --git a/android/1.0/Android.mk b/android/1.0/Android.mk
index 9d05878..667576c 100644
--- a/android/1.0/Android.mk
+++ b/android/1.0/Android.mk
@@ -93,8 +93,4 @@ LOCAL_SHARED_LIBRARIES += \
 
 LOCAL_CFLAGS += $(GNSS_CFLAGS)
 
-ifneq ($(LOC_HIDL_VERSION),)
-LOCAL_CFLAGS += -DLOC_HIDL_VERSION='"$(LOC_HIDL_VERSION)"'
-endif
-
 include $(BUILD_EXECUTABLE)
diff --git a/android/1.0/service.cpp b/android/1.0/service.cpp
index 2a6f60f..90ae802 100644
--- a/android/1.0/service.cpp
+++ b/android/1.0/service.cpp
@@ -60,23 +60,7 @@ int main() {
 
     status = registerPassthroughServiceImplementation<IGnss>();
     if (status == OK) {
-        if (vendorEnhanced) {
-    #ifdef LOC_HIDL_VERSION
-            #define VENDOR_ENHANCED_LIB "vendor.qti.gnss@" LOC_HIDL_VERSION "-service.so"
-
-            void* libHandle = NULL;
-            vendorEnhancedServiceMain* vendorEnhancedMainMethod = (vendorEnhancedServiceMain*)
-                    dlGetSymFromLib(libHandle, VENDOR_ENHANCED_LIB, "main");
-            if (NULL != vendorEnhancedMainMethod) {
-                (*vendorEnhancedMainMethod)(0, NULL);
-            }
-    #else
-            ALOGE("LOC_HIDL_VERSION not defined.");
-    #endif
-        }
-
         joinRpcThreadpool();
-
     } else {
         ALOGE("Error while registering IGnss 1.0 service: %d", status);
     }
diff --git a/android/1.1/Android.mk b/android/1.1/Android.mk
index 8ed6e5e..5a4319d 100644
--- a/android/1.1/Android.mk
+++ b/android/1.1/Android.mk
@@ -95,8 +95,4 @@ LOCAL_SHARED_LIBRARIES += \
 
 LOCAL_CFLAGS += $(GNSS_CFLAGS)
 
-ifneq ($(LOC_HIDL_VERSION),)
-LOCAL_CFLAGS += -DLOC_HIDL_VERSION='"$(LOC_HIDL_VERSION)"'
-endif
-
 include $(BUILD_EXECUTABLE)
diff --git a/android/1.1/service.cpp b/android/1.1/service.cpp
index 0cb91f7..86d168e 100644
--- a/android/1.1/service.cpp
+++ b/android/1.1/service.cpp
@@ -60,23 +60,7 @@ int main() {
 
     status = registerPassthroughServiceImplementation<IGnss>();
     if (status == OK) {
-        if (vendorEnhanced) {
-    #ifdef LOC_HIDL_VERSION
-            #define VENDOR_ENHANCED_LIB "vendor.qti.gnss@" LOC_HIDL_VERSION "-service.so"
-
-            void* libHandle = NULL;
-            vendorEnhancedServiceMain* vendorEnhancedMainMethod = (vendorEnhancedServiceMain*)
-                    dlGetSymFromLib(libHandle, VENDOR_ENHANCED_LIB, "main");
-            if (NULL != vendorEnhancedMainMethod) {
-                (*vendorEnhancedMainMethod)(0, NULL);
-            }
-    #else
-            ALOGE("LOC_HIDL_VERSION not defined.");
-    #endif
-        }
-
         joinRpcThreadpool();
-
     } else {
         ALOGE("Error while registering IGnss 1.1 service: %d", status);
     }
diff --git a/android/2.0/Android.mk b/android/2.0/Android.mk
index daeaad7..543a137 100644
--- a/android/2.0/Android.mk
+++ b/android/2.0/Android.mk
@@ -105,8 +105,4 @@ LOCAL_SHARED_LIBRARIES += \
 
 LOCAL_CFLAGS += $(GNSS_CFLAGS)
 
-ifneq ($(LOC_HIDL_VERSION),)
-LOCAL_CFLAGS += -DLOC_HIDL_VERSION='"$(LOC_HIDL_VERSION)"'
-endif
-
 include $(BUILD_EXECUTABLE)
diff --git a/android/2.0/service.cpp b/android/2.0/service.cpp
index 3c9af95..c37d44c 100644
--- a/android/2.0/service.cpp
+++ b/android/2.0/service.cpp
@@ -84,18 +84,6 @@ int main() {
 
     status = registerPassthroughServiceImplementation<IGnss>();
     if (status == OK) {
-    #ifdef LOC_HIDL_VERSION
-        #define VENDOR_ENHANCED_LIB "vendor.qti.gnss@" LOC_HIDL_VERSION "-service.so"
-
-        void* libHandle = NULL;
-        vendorEnhancedServiceMain* vendorEnhancedMainMethod = (vendorEnhancedServiceMain*)
-                dlGetSymFromLib(libHandle, VENDOR_ENHANCED_LIB, "main");
-        if (NULL != vendorEnhancedMainMethod) {
-            (*vendorEnhancedMainMethod)(0, NULL);
-        }
-    #else
-        ALOGI("LOC_HIDL_VERSION not defined.");
-    #endif
         initializeGnssPowerHandler();
         joinRpcThreadpool();
     } else {
diff --git a/android/2.1/Android.mk b/android/2.1/Android.mk
index c45017c..4202005 100644
--- a/android/2.1/Android.mk
+++ b/android/2.1/Android.mk
@@ -108,8 +108,4 @@ LOCAL_SHARED_LIBRARIES += \
 
 LOCAL_CFLAGS += $(GNSS_CFLAGS)
 
-ifneq ($(LOC_HIDL_VERSION),)
-LOCAL_CFLAGS += -DLOC_HIDL_VERSION='"$(LOC_HIDL_VERSION)"'
-endif
-
 include $(BUILD_EXECUTABLE)
diff --git a/android/2.1/service.cpp b/android/2.1/service.cpp
index b42e681..22cc0f2 100644
--- a/android/2.1/service.cpp
+++ b/android/2.1/service.cpp
@@ -87,18 +87,6 @@ int main() {
 
     status = registerPassthroughServiceImplementation<IGnss>();
     if (status == OK) {
-    #ifdef LOC_HIDL_VERSION
-        #define VENDOR_ENHANCED_LIB "vendor.qti.gnss@" LOC_HIDL_VERSION "-service.so"
-
-        void* libHandle = NULL;
-        vendorEnhancedServiceMain* vendorEnhancedMainMethod = (vendorEnhancedServiceMain*)
-                dlGetSymFromLib(libHandle, VENDOR_ENHANCED_LIB, "main");
-        if (NULL != vendorEnhancedMainMethod) {
-            (*vendorEnhancedMainMethod)(0, NULL);
-        }
-    #else
-        ALOGI("LOC_HIDL_VERSION not defined.");
-    #endif
         initializeGnssPowerHandler();
         joinRpcThreadpool();
     } else {
diff --git a/android/aidl-impl/Android.mk b/android/aidl-impl/Android.mk
index 11aaf10..57f102e 100644
--- a/android/aidl-impl/Android.mk
+++ b/android/aidl-impl/Android.mk
@@ -25,7 +25,6 @@ LOCAL_HEADER_LIBRARIES := \
 
 LOCAL_SHARED_LIBRARIES := \
     libbase \
-    libhidlbase \
     libbinder_ndk \
     android.hardware.gnss-V1-ndk_platform \
     liblog \
@@ -80,8 +79,4 @@ LOCAL_SHARED_LIBRARIES += \
 
 LOCAL_CFLAGS += $(GNSS_CFLAGS)
 
-ifneq ($(LOC_HIDL_VERSION),)
-LOCAL_CFLAGS += -DLOC_HIDL_VERSION='"$(LOC_HIDL_VERSION)"'
-endif
-
 include $(BUILD_EXECUTABLE)
diff --git a/android/aidl-impl/Gnss.h b/android/aidl-impl/Gnss.h
index 4063180..c0ad168 100644
--- a/android/aidl-impl/Gnss.h
+++ b/android/aidl-impl/Gnss.h
@@ -32,8 +32,6 @@
 #include "GnssConfiguration.h"
 #include "GnssPowerIndication.h"
 #include "GnssMeasurementInterface.h"
-#include <hidl/MQDescriptor.h>
-#include <hidl/Status.h>
 
 namespace android {
 namespace hardware {
diff --git a/android/aidl-impl/service.cpp b/android/aidl-impl/service.cpp
index e893dfe..4edd9f9 100644
--- a/android/aidl-impl/service.cpp
+++ b/android/aidl-impl/service.cpp
@@ -26,8 +26,6 @@
 #include <android/binder_manager.h>
 #include <android/binder_process.h>
 #include "Gnss.h"
-#include <hidl/HidlSupport.h>
-#include <hidl/HidlTransportSupport.h>
 #include <pthread.h>
 #include <log_util.h>
 
@@ -54,7 +52,6 @@ using android::OK;
 typedef int vendorEnhancedServiceMain(int /* argc */, char* /* argv */ []);
 
 using GnssAidl = ::android::hardware::gnss::aidl::implementation::Gnss;
-using android::hardware::configureRpcThreadpool;
 using ::android::hardware::gnss::V1_0::GnssLocation;
 using android::hardware::gnss::V2_1::IGnss;
 
@@ -98,17 +95,6 @@ int main() {
         if (NULL != aidlMainMethod) {
             ALOGI("start LocAidl service");
             (*aidlMainMethod)(0, NULL);
-        } else {
-            #ifdef LOC_HIDL_VERSION
-                #define VENDOR_ENHANCED_LIB "vendor.qti.gnss@" LOC_HIDL_VERSION "-service.so"
-                void* libHandle = NULL;
-                vendorEnhancedServiceMain* vendorEnhancedMainMethod = (vendorEnhancedServiceMain*)
-                        dlGetSymFromLib(libHandle, VENDOR_ENHANCED_LIB, "main");
-                if (NULL != vendorEnhancedMainMethod) {
-                    (*vendorEnhancedMainMethod)(0, NULL);
-                }
-            #endif
-
         }
         // Loc AIDL service end
         joinRpcThreadpool();