From d9152046fa10b9a36c5a17d1c21adc4d7a2b8a8e Mon Sep 17 00:00:00 2001
From: Vishwath Mohan <vishwath@google.com>
Date: Sat, 17 Jun 2017 10:36:16 -0700
Subject: wayne: Remove hardcoded LOCAL_MODULE_PATHS from vendor components

This CL replaces all LOCAL_MODULE_PATH_* definitions for vendor shared
libraries with LOCAL_VENDOR_MODULE := true instead. This appropriately
generates sanitized versions of these libraries to /data/asan/* while
generating the stock versions in /vendor/lib* as desired.

Needed for ASAN builds to work correctly.

Bug: 37740897
Test: m -j40 && SANITIZE_TARGET="address" m -j40 # shared libs in
$ANDROID_PRODUCT_OUT/vendor/lib* do not contain asan symbols, while
the ones in $ANDROID_PRODUCT_OUT/data/asan/vendor/lib* do.

Change-Id: If6a495dd153c47f929de047fd48039b990348720
(cherry picked from commit e872612127cfbf55ceba01e9860e0acc47d64447)
---
 gps/utils/Android.mk                                        | 4 ++--
 gps/utils/platform_lib_abstractions/loc_pla/src/Android.mk  | 3 +--
 gps/utils/platform_lib_abstractions/loc_stub/src/Android.mk | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'gps/utils')

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
-- 
cgit v1.2.3