diff options
-rw-r--r-- | device_base.mk | 7 | ||||
-rw-r--r-- | full_crespo.mk | 7 | ||||
-rwxr-xr-x | setup-makefiles.sh | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/device_base.mk b/device_base.mk index 705820e..2670dfe 100644 --- a/device_base.mk +++ b/device_base.mk @@ -96,6 +96,13 @@ PRODUCT_PACKAGES += \ libstagefrighthw \ com.android.future.usb.accessory +# 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..ae9c91b 100644 --- a/full_crespo.mk +++ b/full_crespo.mk @@ -19,14 +19,17 @@ # product configuration (apps). # +# Get the long list of APNs +PRODUCT_COPY_FILES := device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml + # Inherit from those products. Most specific first. -$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) # This is where we'd set a backup provider if we had one #$(call inherit-product, device/sample/products/backup_overlay.mk) $(call inherit-product, device/samsung/crespo/device.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/full.mk) # Discard inherited values and use our own instead. PRODUCT_NAME := full_crespo PRODUCT_DEVICE := crespo +PRODUCT_BRAND := Android PRODUCT_MODEL := Full Android on Crespo diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 230bc67..916c1ea 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -48,13 +48,6 @@ PRODUCT_PACKAGES := \\ PRODUCT_COPY_FILES := \\ packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:/system/etc/permissions/android.software.live_wallpaper.xml -# NFC packages -PRODUCT_PACKAGES += \\ - libnfc \\ - libnfc_jni \\ - Nfc \\ - Tag - # Pick up overlay for features that depend on non-open-source files DEVICE_PACKAGE_OVERLAYS := vendor/__MANUFACTURER__/__DEVICE__/overlay |