diff options
-rw-r--r-- | target/product/emulator.mk | 3 | ||||
-rw-r--r-- | target/product/sdk.mk | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/target/product/emulator.mk b/target/product/emulator.mk index 582ca64..146a00a 100644 --- a/target/product/emulator.mk +++ b/target/product/emulator.mk @@ -34,3 +34,6 @@ PRODUCT_PACKAGES += \ lib64GLES_CM_translator \ lib64GLES_V2_translator \ lib64EGL_translator + +PRODUCT_COPY_FILES += \ + device/generic/goldfish/fstab.goldfish:root/fstab.goldfish diff --git a/target/product/sdk.mk b/target/product/sdk.mk index 3226423..1918c33 100644 --- a/target/product/sdk.mk +++ b/target/product/sdk.mk @@ -68,8 +68,6 @@ PRODUCT_PACKAGES := \ rild \ LegacyCamera -include $(SRC_TARGET_DIR)/product/emulator.mk - # Define the host tools and libs that are parts of the SDK. -include sdk/build/product_sdk.mk -include development/build/product_sdk.mk @@ -83,7 +81,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGE_OVERLAYS := development/sdk_overlay PRODUCT_COPY_FILES := \ - device/generic/goldfish/fstab.goldfish:root/fstab.goldfish \ device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ system/core/rootdir/etc/vold.fstab:system/etc/vold.fstab \ frameworks/base/data/sounds/effects/camera_click.ogg:system/media/audio/ui/camera_click.ogg \ @@ -96,6 +93,8 @@ PRODUCT_COPY_FILES := \ frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf \ hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf +include $(SRC_TARGET_DIR)/product/emulator.mk + $(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk) $(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk) |