X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=blobdiff_plain;f=device.mk;h=95001d80d357279fe7efaebb99de2642ef88505a;hp=559a3cbe2ffee7cdaf7c3239ec7a203d2a8621c4;hb=897bf6607e0f079d0fd9a83371942a2e4e39b952;hpb=81475bc5b5714f0b5a3fc241de6f34acc6b79a68

diff --git a/device.mk b/device.mk
index 559a3cb..95001d8 100644
--- a/device.mk
+++ b/device.mk
@@ -43,6 +43,7 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/media_codecs.xml:system/etc/media_codecs.xml \
     $(LOCAL_PATH)/media_profiles.xml:system/etc/media_profiles.xml \
     device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml \
+    device/sample/etc/old-apns-conf.xml:system/etc/old-apns-conf.xml \
     frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
     frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
     frameworks/native/data/etc/tablet_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml \
@@ -80,7 +81,7 @@ PRODUCT_AAPT_PREF_CONFIG := mdpi
 DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
 
 # Get the firmwares
-$(call inherit-product,$(LOCAL_PATH)/firmware.mk)
+$(call inherit-product,device/generic/firmware/firmware.mk)
 
 # Get the touchscreen calibration tool
 $(call inherit-product-if-exists,external/tslib/tslib.mk)