diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-22 09:04:36 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-10-22 09:04:36 -0700 |
| commit | 3f83e3b4baff2f7b457f8cc053a3a8d74eb0f1c2 (patch) | |
| tree | 9298f279527ab305baae2e78ebc3bae16640f648 | |
| parent | 399345f89c4a69d80df78564122d757ffdd06c1e (diff) | |
| download | device_samsung_crespo-3f83e3b4baff2f7b457f8cc053a3a8d74eb0f1c2.zip device_samsung_crespo-3f83e3b4baff2f7b457f8cc053a3a8d74eb0f1c2.tar.gz device_samsung_crespo-3f83e3b4baff2f7b457f8cc053a3a8d74eb0f1c2.tar.bz2 | |
Move Nfc to be a product-level concern (not device-level)
Change-Id: I22c9cabd4b6edac71687702d79d7d7589613ba7d
| -rw-r--r-- | device.mk | 7 | ||||
| -rw-r--r-- | full_crespo.mk | 10 |
2 files changed, 10 insertions, 7 deletions
@@ -115,13 +115,6 @@ PRODUCT_PACKAGES += \ libcamera \ libstagefrighthw -# NFC -PRODUCT_PACKAGES += \ - libnfc \ - libnfc_jni \ - Nfc \ - Tag - # Input device calibration files PRODUCT_COPY_FILES += \ device/samsung/crespo/mxt224_ts_input.idc:system/usr/idc/mxt224_ts_input.idc diff --git a/full_crespo.mk b/full_crespo.mk index c6957e0..4b0bf74 100644 --- a/full_crespo.mk +++ b/full_crespo.mk @@ -19,6 +19,16 @@ # product configuration (apps). # +# NFC is a product-level aspect that is too closely tied +# to this device to justify putting in a more generic config, +# but which is also not quite a low-level driver to put in +# device.mk +PRODUCT_PACKAGES := \ + libnfc \ + libnfc_jni \ + Nfc \ + Tag + # 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 |