device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH

LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it
with LOCAL_MODULE_RELATIVE_PATH.

Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e

10 files changed, 12 insertions, 14 deletions

diff --git a/audio/Android.mk b/audio/Android.mk
index 188fa21..8e21fe8 100644
--- a/audio/Android.mk
+++ b/audio/Android.mk
@@ -18,7 +18,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := audio.primary.goldfish
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SHARED_LIBRARIES := libcutils liblog
diff --git a/camera/Android.mk b/camera/Android.mk
index 7aa5856..d852e7f 100755..100644
--- a/camera/Android.mk
+++ b/camera/Android.mk
@@ -17,7 +17,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_CFLAGS += -fno-short-enums -DQEMU_HARDWARE
 LOCAL_SHARED_LIBRARIES:= \
     libbinder \
@@ -76,7 +76,7 @@ ifneq ($(TARGET_BUILD_PDK),true)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_CFLAGS += -fno-short-enums -DQEMU_HARDWARE
 LOCAL_SHARED_LIBRARIES:= \
     libcutils \
diff --git a/gps/Android.mk b/gps/Android.mk
index 6840f84..65b637c 100644
--- a/gps/Android.mk
+++ b/gps/Android.mk
@@ -24,7 +24,7 @@ LOCAL_PATH := $(call my-dir)
 # hw/<GPS_HARDWARE_MODULE_ID>.<ro.hardware>.so
 include $(CLEAR_VARS)
 
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_CFLAGS += -DQEMU_HARDWARE
 LOCAL_SHARED_LIBRARIES := liblog libcutils libhardware
 LOCAL_SRC_FILES := gps_qemu.c
diff --git a/lights/Android.mk b/lights/Android.mk
index 3fa04ed..49f2d76 100644
--- a/lights/Android.mk
+++ b/lights/Android.mk
@@ -18,7 +18,7 @@ LOCAL_PATH := $(call my-dir)
 # hw/<LIGHTS_HARDWARE_MODULE_ID>.<ro.hardware>.so
 include $(CLEAR_VARS)
 LOCAL_PRELINK_MODULE := false
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_SHARED_LIBRARIES := liblog libcutils
 LOCAL_SRC_FILES := lights_qemu.c
 LOCAL_MODULE := lights.goldfish
diff --git a/opengl/common.mk b/opengl/common.mk
index 6dd503e..a4ea7d7 100644
--- a/opengl/common.mk
+++ b/opengl/common.mk
@@ -234,7 +234,5 @@ endef
 # $1: library sub-path,relative to /system/lib
 # For example: $(call emugl-set-shared-library-subpath,egl)
 emugl-set-shared-library-subpath = \
-    $(eval LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/$1)\
-    $(eval LOCAL_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/$1)\
-    $(eval _emugl.$(LOCAL_MODULE).moved := true)\
-    $(call emugl-export-outer,ADDITIONAL_DEPENDENCIES,$(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)$(TARGET_SHLIB_SUFFIX))
+    $(eval LOCAL_MODULE_RELATIVE_PATH := $1)\
+    $(eval _emugl.$(LOCAL_MODULE).moved := true)
diff --git a/opengl/system/GLESv1/Android.mk b/opengl/system/GLESv1/Android.mk
index 97356b7..8762c11 100644
--- a/opengl/system/GLESv1/Android.mk
+++ b/opengl/system/GLESv1/Android.mk
@@ -7,6 +7,6 @@ $(call emugl-import,libOpenglSystemCommon libGLESv1_enc lib_renderControl_enc)
 LOCAL_CFLAGS += -DLOG_TAG=\"GLES_emulation\" -DGL_GLEXT_PROTOTYPES
 
 LOCAL_SRC_FILES := gl.cpp
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
+LOCAL_MODULE_RELATIVE_PATH := egl
 
 $(call emugl-end-module)
diff --git a/opengl/system/GLESv2/Android.mk b/opengl/system/GLESv2/Android.mk
index c299522..5a23424 100644
--- a/opengl/system/GLESv2/Android.mk
+++ b/opengl/system/GLESv2/Android.mk
@@ -7,6 +7,6 @@ $(call emugl-import,libOpenglSystemCommon libGLESv2_enc lib_renderControl_enc)
 LOCAL_CFLAGS += -DLOG_TAG=\"GLESv2_emulation\" -DGL_GLEXT_PROTOTYPES
 
 LOCAL_SRC_FILES := gl2.cpp
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
+LOCAL_MODULE_RELATIVE_PATH := egl
 
 $(call emugl-end-module)
diff --git a/power/Android.mk b/power/Android.mk
index 30d21a3..0273f04 100644
--- a/power/Android.mk
+++ b/power/Android.mk
@@ -19,7 +19,7 @@ LOCAL_PATH := $(call my-dir)
 # hw/<POWERS_HARDWARE_MODULE_ID>.<ro.hardware>.so
 include $(CLEAR_VARS)
 
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_CFLAGS += -DQEMU_HARDWARE
 LOCAL_SHARED_LIBRARIES := liblog libcutils
 LOCAL_SRC_FILES := power_qemu.c
diff --git a/sensors/Android.mk b/sensors/Android.mk
index a1b8967..214ead6 100644
--- a/sensors/Android.mk
+++ b/sensors/Android.mk
@@ -19,7 +19,7 @@ LOCAL_PATH := $(call my-dir)
 # hw/<SENSORS_HARDWARE_MODULE_ID>.<ro.hardware>.so
 include $(CLEAR_VARS)
 
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_SHARED_LIBRARIES := liblog libcutils
 LOCAL_SRC_FILES := sensors_qemu.c
 ifeq ($(TARGET_PRODUCT),vbox_x86)
diff --git a/vibrator/Android.mk b/vibrator/Android.mk
index 646da5c..6ab9c38 100644
--- a/vibrator/Android.mk
+++ b/vibrator/Android.mk
@@ -20,7 +20,7 @@ LOCAL_MODULE := vibrator.goldfish
 
 # HAL module implemenation stored in
 # hw/<VIBRATOR_HARDWARE_MODULE_ID>.goldfish.so
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_C_INCLUDES := hardware/libhardware hardware/libhardware_legacy
 LOCAL_SRC_FILES := vibrator_qemu.c
 LOCAL_SHARED_LIBRARIES := liblog libhardware libhardware_legacy