From e02516865e701fbb9535d1230177c8ab898dc827 Mon Sep 17 00:00:00 2001
From: Rashed Abdel-Tawab <rashed@linux.com>
Date: Tue, 14 Aug 2018 19:37:18 -0700
Subject: [PATCH] Move to hardcoded vendor/extra paths

---
 product.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/product.mk b/product.mk
index 554ef5a..887d0b3 100644
--- a/product.mk
+++ b/product.mk
@@ -22,12 +22,12 @@ PRODUCT_PACKAGES += auditd
 
 # Disable package cache on all builds
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/lineage-package_cache.rc:system/etc/init/lineage-package_cache.rc
+    vendor/extra/lineage-package_cache.rc:system/etc/init/lineage-package_cache.rc
 
 PRODUCT_PROPERTY_OVERRIDES += ro.opa.eligible_device=true
 
 # Themes
-DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
+DEVICE_PACKAGE_OVERLAYS += vendor/extra/overlay
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += ro.boot.vendor.overlay.theme=com.google.android.theme.pixel
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += ro.com.google.ime.theme_id=5
 PRODUCT_PACKAGES += \
@@ -37,7 +37,7 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.config.vc_call_vol_steps=7 \
     ro.config.media_vol_steps=18
 
-$(call prepend-product-if-exists, vendor/rashed/product.mk)
+-include vendor/rashed/product.mk
 ifneq ($(DISABLE_GAPPS),true)
-$(call prepend-product-if-exists, vendor/extra/gapps.mk)
+-include vendor/extra/gapps.mk
 endif