7 files changed, 13 insertions, 14 deletions
diff --git a/gps/android/Android.mk b/gps/android/Android.mk
index d503010..18845ef 100644
--- a/gps/android/Android.mk
+++ b/gps/android/Android.mk
@@ -2,8 +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_VENDOR_MODULE := true
+LOCAL_MODULE_OWNER := qti
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_SRC_FILES := \
     AGnss.cpp \
diff --git a/gps/core/Android.mk b/gps/core/Android.mk
index dba0b0a..6e58dc9 100644
--- a/gps/core/Android.mk
+++ b/gps/core/Android.mk
@@ -6,8 +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_VENDOR_MODULE := true
+LOCAL_MODULE_OWNER := qti
 LOCAL_MODULE_TAGS := optional
 
 ifeq ($(TARGET_DEVICE),apq8026_lw)
diff --git a/gps/gnss/Android.mk b/gps/gnss/Android.mk
index 4d738bd..e5b9dcc 100644
--- a/gps/gnss/Android.mk
+++ b/gps/gnss/Android.mk
@@ -6,8 +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_VENDOR_MODULE := true
+LOCAL_MODULE_OWNER := qti
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SHARED_LIBRARIES := \
diff --git a/gps/location/Android.mk b/gps/location/Android.mk
index 6ac8e36..2792b12 100644
--- a/gps/location/Android.mk
+++ b/gps/location/Android.mk
@@ -6,8 +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_VENDOR_MODULE := true
+LOCAL_MODULE_OWNER := qti
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SHARED_LIBRARIES := \
diff --git a/gps/utils/Android.mk b/gps/utils/Android.mk
index 3f3b83a..197cd76 100644
--- a/gps/utils/Android.mk
+++ b/gps/utils/Android.mk
@@ -45,8 +45,8 @@ LOCAL_HEADER_LIBRARIES := \
     liblocation_api_headers
 
 LOCAL_MODULE := libgps.utils
-LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
-LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
+LOCAL_VENDOR_MODULE := true
+LOCAL_MODULE_OWNER := qti
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_PRELINK_MODULE := false
diff --git a/gps/utils/platform_lib_abstractions/loc_pla/src/Android.mk b/gps/utils/platform_lib_abstractions/loc_pla/src/Android.mk
index ab13717..25d9439 100644
--- a/gps/utils/platform_lib_abstractions/loc_pla/src/Android.mk
+++ b/gps/utils/platform_lib_abstractions/loc_pla/src/Android.mk
@@ -51,8 +51,7 @@ LOCAL_HEADER_LIBRARIES := \
     libloc_stub_headers
 
 LOCAL_MODULE := libloc_pla
-LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
-LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_PRELINK_MODULE := false
diff --git a/gps/utils/platform_lib_abstractions/loc_stub/src/Android.mk b/gps/utils/platform_lib_abstractions/loc_stub/src/Android.mk
index 08697cb..f4cec2b 100644
--- a/gps/utils/platform_lib_abstractions/loc_stub/src/Android.mk
+++ b/gps/utils/platform_lib_abstractions/loc_stub/src/Android.mk
@@ -32,8 +32,8 @@ LOCAL_C_INCLUDES:= \
     $(LOCAL_PATH)/../include \
 
 LOCAL_MODULE := libloc_stub
-LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
-LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
+LOCAL_VENDOR_MODULE := true
+LOCAL_MODULE_OWNER := qti
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_PRELINK_MODULE := false