g3-common: firmware and symlinks to /vendor

Change-Id: I9377061801c7792f881b024695f57f8a452b1093

2 files changed, 11 insertions, 11 deletions

diff --git a/Android.mk b/Android.mk
index fd58a36..957e2f1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,7 +30,7 @@ endef
 DXHDCP2_IMAGES := \
     dxhdcp2.b00 dxhdcp2.b01 dxhdcp2.b02 dxhdcp2.b03 dxhdcp2.mdt
 
-DXHDCP2_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(DXHDCP2_IMAGES))
+DXHDCP2_SYMLINKS := $(addprefix $(TARGET_OUT_VENDOR)/firmware/,$(DXHDCP2_IMAGES))
 $(DXHDCP2_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 	@echo "dxhdcp2 firmware link: $@"
 	@mkdir -p $(dir $@)
@@ -42,7 +42,7 @@ ALL_DEFAULT_INSTALLED_MODULES += $(DXHDCP2_SYMLINKS)
 KEYMASTER_IMAGES := \
     keymaste.b00 keymaste.b01 keymaste.b02 keymaste.b03 keymaste.mdt
 
-KEYMASTER_SYMLINKS :=$(addprefix $(TARGET_OUT_ETC)/firmware/,$(KEYMASTER_IMAGES))
+KEYMASTER_SYMLINKS :=$(addprefix $(TARGET_OUT_VENDOR)/firmware/,$(KEYMASTER_IMAGES))
 $(KEYMASTER_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 	@echo "keymaster firmware link: $@"
 	@mkdir -p $(dir $@)
@@ -54,7 +54,7 @@ ALL_DEFAULT_INSTALLED_MODULES += $(KEYMASTER_SYMLINKS)
 MLSERVERAPP_IMAGES := \
     mlserverapp.b00 mlserverapp.b01 mlserverapp.b02 mlserverapp.b03 mlserverapp.mdt
 
-MLSERVERAPP_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(MLSERVERAPP_IMAGES))
+MLSERVERAPP_SYMLINKS := $(addprefix $(TARGET_OUT_VENDOR)/firmware/,$(MLSERVERAPP_IMAGES))
 $(MLSERVERAPP_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 	@echo "mlserverapp firmware link: $@"
 	@mkdir -p $(dir $@)
@@ -66,7 +66,7 @@ ALL_DEFAULT_INSTALLED_MODULES += $(MLSERVERAPP_SYMLINKS)
 TQS_IMAGES := \
     tqs.b00 tqs.b01 tqs.b02 tqs.b03 tqs.mdt
 
-TQS_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/,$(TQS_IMAGES))
+TQS_SYMLINKS := $(addprefix $(TARGET_OUT_VENDOR)/firmware/,$(TQS_IMAGES))
 $(TQS_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 	@echo "tqs firmware link: $@"
 	@mkdir -p $(dir $@)
@@ -78,7 +78,7 @@ ALL_DEFAULT_INSTALLED_MODULES += $(TQS_SYMLINKS)
 WCD9320_IMAGES := \
     wcd9320_anc.bin wcd9320_mad_audio.bin wcd9320_mbhc.bin
 
-WCD9320_SYMLINKS := $(addprefix $(TARGET_OUT_ETC)/firmware/wcd9320/,$(WCD9320_IMAGES))
+WCD9320_SYMLINKS := $(addprefix $(TARGET_OUT_VENDOR)/firmware/wcd9320/,$(WCD9320_IMAGES))
 $(WCD9320_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 	@echo "wcd9320 firmware link: $@"
 	@mkdir -p $(dir $@)
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 84c05e1..9511cf2 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -174,16 +174,16 @@ bin/irsc_util:vendor/bin/irsc_util
 
 # Radio
 -priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
--app/shutdownlistener/shutdownlistener.apk
+-app/shutdownlistener/shutdownlistener.apk:vendor/app/shutdownlistener/shutdownlistener.apk
 bin/radish:vendor/bin/radish
 lib/librmnetctl.so:vendor/lib/librmnetctl.so
 vendor/lib/libsmemlog.so
 vendor/lib/libsystem_health_mon.so
 vendor/lib/libxml.so
-etc/permissions/qcnvitems.xml
-etc/permissions/qcrilhook.xml
-framework/qcnvitems.jar
-framework/qcrilhook.jar
+etc/permissions/qcnvitems.xml:vendor/etc/permissions/qcnvitems.xml
+etc/permissions/qcrilhook.xml:vendor/etc/permissions/qcrilhook.xml
+framework/qcnvitems.jar:vendor/framework/qcnvitems.jar
+framework/qcrilhook.jar:vendor/framework/qcrilhook.jar
 
 # Sensors
 etc/sensors/sensor_def_common.conf:vendor/etc/sensors/sensor_def_common.conf
@@ -201,7 +201,7 @@ vendor/lib/libthermalioctl.so
 bin/time_daemon:vendor/bin/time_daemon|e5fe186973b90715ab9a045d4dcd63d0134e2e63
 -vendor/lib/libtime_genoff.so
 vendor/lib/libTimeService.so
--app/TimeService/TimeService.apk
+-app/TimeService/TimeService.apk:vendor/app/TimeService/TimeService.apk
 
 # WCNSS
 vendor/firmware/wcnss.b00