X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=device.mk;h=62caf4d9db9d1d77d8c5cfce86dd232ebfb2b519;hb=20decd761ec507b1e221a94418648923444a8913;hp=3d3468b57bd700974585e2455ab528fbdf16535d;hpb=517e604ae5a322d86ccfb4aa0306862acbfe34d9;p=android-x86%2Fdevice-generic-common.git

diff --git a/device.mk b/device.mk
index 3d3468b..62caf4d 100644
--- a/device.mk
+++ b/device.mk
@@ -50,7 +50,6 @@ PRODUCT_COPY_FILES += \
     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/base/config/compiled-classes-phone:system/etc/compiled-classes \
     frameworks/native/data/etc/tablet_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml \
     frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
     frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \
@@ -115,3 +114,5 @@ $(call inherit-product-if-exists,vendor/google/products/gms.mk)
 
 # Get native bridge settings
 $(call inherit-product-if-exists,$(LOCAL_PATH)/nativebridge/nativebridge.mk)
+
+$(call inherit-product,$(if $(wildcard $(PRODUCT_DIR)packages.mk),$(PRODUCT_DIR),$(LOCAL_PATH)/)packages.mk)