From 891005e20c0d8eed1ed4c9738540b82fdfdabe06 Mon Sep 17 00:00:00 2001 From: Dante Russo Date: Wed, 22 Mar 2017 13:18:38 -0700 Subject: [PATCH] Move gnss hal to vendor partition gnss hal is moved to vendor partition for binerization enablement CRs-fixed: 2020778 Change-Id: I8de91d0418ef4b9a1c778c45fe02d27d42c46c97 --- android/Android.mk | 3 +++ android/android.hardware.gnss@1.0-service-qti.rc | 6 +++--- core/Android.mk | 2 ++ gnss/Android.mk | 2 ++ location/Android.mk | 2 ++ utils/Android.mk | 3 ++- utils/platform_lib_abstractions/loc_pla/src/Android.mk | 3 ++- utils/platform_lib_abstractions/loc_stub/src/Android.mk | 3 ++- 8 files changed, 18 insertions(+), 6 deletions(-) diff --git a/android/Android.mk b/android/Android.mk index 8c647658..a9b0d4bc 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gnss@1.0-impl-qti +LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib +LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := \ AGnss.cpp \ @@ -46,6 +48,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gnss@1.0-service-qti +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES) LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_INIT_RC := android.hardware.gnss@1.0-service-qti.rc LOCAL_SRC_FILES := \ diff --git a/android/android.hardware.gnss@1.0-service-qti.rc b/android/android.hardware.gnss@1.0-service-qti.rc index 7ba64601..8c54231f 100644 --- a/android/android.hardware.gnss@1.0-service-qti.rc +++ b/android/android.hardware.gnss@1.0-service-qti.rc @@ -1,4 +1,4 @@ -service gnss_service /system/bin/hw/android.hardware.gnss@1.0-service-qti +service gnss_service /vendor/bin/hw/android.hardware.gnss@1.0-service-qti class main - user system - group system + user gps + group system gps inet diff --git a/core/Android.mk b/core/Android.mk index 3051a92b..313ee25d 100644 --- a/core/Android.mk +++ b/core/Android.mk @@ -6,6 +6,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libloc_core +LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib +LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 LOCAL_MODULE_TAGS := optional ifeq ($(TARGET_DEVICE),apq8026_lw) diff --git a/gnss/Android.mk b/gnss/Android.mk index 9103894c..ea362087 100644 --- a/gnss/Android.mk +++ b/gnss/Android.mk @@ -6,6 +6,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libgnss +LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib +LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := \ diff --git a/location/Android.mk b/location/Android.mk index bdd3e6b8..6d2c9fa8 100644 --- a/location/Android.mk +++ b/location/Android.mk @@ -6,6 +6,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := liblocation_api +LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib +LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := \ diff --git a/utils/Android.mk b/utils/Android.mk index 6a441f0f..ef1e5e16 100644 --- a/utils/Android.mk +++ b/utils/Android.mk @@ -65,7 +65,8 @@ LOCAL_COPY_HEADERS:= \ loc_gps.h LOCAL_MODULE := libgps.utils - +LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib +LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 LOCAL_MODULE_TAGS := optional LOCAL_PRELINK_MODULE := false diff --git a/utils/platform_lib_abstractions/loc_pla/src/Android.mk b/utils/platform_lib_abstractions/loc_pla/src/Android.mk index ad07197b..0bcddcba 100644 --- a/utils/platform_lib_abstractions/loc_pla/src/Android.mk +++ b/utils/platform_lib_abstractions/loc_pla/src/Android.mk @@ -45,7 +45,8 @@ LOCAL_COPY_HEADERS:= \ ../include/platform_lib_time.h LOCAL_MODULE := libloc_pla - +LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib +LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 LOCAL_MODULE_TAGS := optional LOCAL_PRELINK_MODULE := false diff --git a/utils/platform_lib_abstractions/loc_stub/src/Android.mk b/utils/platform_lib_abstractions/loc_stub/src/Android.mk index e69b012e..e899ca38 100644 --- a/utils/platform_lib_abstractions/loc_stub/src/Android.mk +++ b/utils/platform_lib_abstractions/loc_stub/src/Android.mk @@ -41,7 +41,8 @@ LOCAL_COPY_HEADERS:= \ ../include/loc_stub_time.h LOCAL_MODULE := libloc_stub - +LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib +LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 LOCAL_MODULE_TAGS := optional LOCAL_PRELINK_MODULE := false