Use BUILD_PREBUILT for device apk blob files
BUG: 17445025
Change-Id: I6ac60fcaf7377cc2b577fafb12807e9688b5b601
diff --git a/self-extractors/lge/staging/device-partial.mk b/self-extractors/lge/staging/device-partial.mk
index 447a478..81cb7bc 100644
--- a/self-extractors/lge/staging/device-partial.mk
+++ b/self-extractors/lge/staging/device-partial.mk
@@ -14,8 +14,6 @@
# LGE blob(s) necessary for Hammerhead hardware
PRODUCT_COPY_FILES := \
- vendor/lge/hammerhead/proprietary/qcrilmsgtunnel.apk:system/app/qcrilmsgtunnel/qcrilmsgtunnel.apk:lge \
- vendor/lge/hammerhead/proprietary/SprintHiddenMenu.apk:system/app/SprintHiddenMenu/SprintHiddenMenu.apk:lge \
vendor/lge/hammerhead/proprietary/MTP_Bluetooth_cal.acdb:system/etc/MTP_Bluetooth_cal.acdb:lge \
vendor/lge/hammerhead/proprietary/MTP_General_cal.acdb:system/etc/MTP_General_cal.acdb:lge \
vendor/lge/hammerhead/proprietary/MTP_Global_cal.acdb:system/etc/MTP_Global_cal.acdb:lge \
diff --git a/self-extractors/root/device-vendor.mk b/self-extractors/root/device-vendor.mk
index 4b7881d..070af7d 100644
--- a/self-extractors/root/device-vendor.mk
+++ b/self-extractors/root/device-vendor.mk
@@ -12,6 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+PRODUCT_PACKAGES += \
+ qcrilmsgtunnel \
+ SprintHiddenMenu
+
LOCAL_STEM := hammerhead/device-partial.mk
$(call inherit-product-if-exists, vendor/broadcom/$(LOCAL_STEM))
