p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 6d12cbc5: am d5198cbc: Merge "Install a unified fstab in the emulator image" into jb-mr2-dev 

* commit '6d12cbc5bc8df4a86da262564a59985da97b9741':
  Install a unified fstab in the emulator image
This commit is contained in:
Ken Sumrall 2013-03-05 03:19:02 +00:00 committed by Android Git Automerger
parent 535ebd01bf 6d12cbc5bc
commit d4c6ff727d
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/product/emulator.mk
View File

@ -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

5
target/product/sdk.mk
View File

@ -69,8 +69,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
@ -84,7 +82,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 \
@ -97,6 +94,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)