summaryrefslogtreecommitdiffstats
path: root/full_crespo.mk
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-10-22 15:34:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-22 15:34:06 -0700
commitef1d479743657d522fd0d2af4df7c2ec5b7cdade (patch)
treef3d1bf9bee150e5ba75a35b96e0b3d72bf9ca69d /full_crespo.mk
parent134211555901eb0209f6f5c7f725db6e2a6eaa70 (diff)
parentfcdb2eea394a3edc08aa55c843f49c269a19979e (diff)
downloaddevice_samsung_crespo-ef1d479743657d522fd0d2af4df7c2ec5b7cdade.zip
device_samsung_crespo-ef1d479743657d522fd0d2af4df7c2ec5b7cdade.tar.gz
device_samsung_crespo-ef1d479743657d522fd0d2af4df7c2ec5b7cdade.tar.bz2
am fcdb2eea: Merge "Trampoline through the vendor side" into gingerbread-plus-aosp
Diffstat (limited to 'full_crespo.mk')
-rw-r--r--full_crespo.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/full_crespo.mk b/full_crespo.mk
index 4b0bf74..fcf904a 100644
--- a/full_crespo.mk
+++ b/full_crespo.mk
@@ -29,6 +29,10 @@ PRODUCT_PACKAGES := \
Nfc \
Tag
+# Get the parts that are either non-open-source or depend
+# on non-open-source drivers
+$(call inherit-product-if-exists, vendor/samsung/crespo/full_crespo-trampoline.mk)
+
# Inherit from those products. Most specific first.
$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
# This is where we'd set a backup provider if we had one