From e1e95b8d53cbf49c77fccd8ccbfd26ef94124e78 Mon Sep 17 00:00:00 2001 From: Andreas Blaesius Date: Sat, 15 Aug 2015 13:10:09 +0200 Subject: Revert "P51XX: force builder to have vendor repos to compile" This reverts commit d281417f8a6882cfb8cc48212f84050715775fc8. Change-Id: Ic13e0a77a3eec36dfc31ebcf96c01e109965e515 --- p5100.mk | 4 ++-- p51xx-common.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/p5100.mk b/p5100.mk index cd499b7..9e85164 100644 --- a/p5100.mk +++ b/p5100.mk @@ -39,5 +39,5 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.sip.xml:system/etc/permissions/android.software.sip.xml \ frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml -# Use the non-open-source parts -$(call inherit-product, vendor/samsung/p51xx/p5100-vendor.mk) +# Use the non-open-source parts, if they're present +$(call inherit-product-if-exists, vendor/samsung/p51xx/p5100-vendor.mk) diff --git a/p51xx-common.mk b/p51xx-common.mk index 8a38433..8a5d414 100755 --- a/p51xx-common.mk +++ b/p51xx-common.mk @@ -32,4 +32,4 @@ PRODUCT_PACKAGES += \ init.espresso10.rc \ ueventd.espresso10.rc -$(call inherit-product, vendor/samsung/p51xx/p51xx-vendor.mk) +$(call inherit-product-if-exists, vendor/samsung/p51xx/p51xx-vendor.mk) -- cgit v1.1