tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Install a unified fstab in the emulator image" into jb-mr2-dev

Browse source
This commit is contained in:
Ken Sumrall 2013-03-05 03:14:26 +00:00 committed by Android (Google) Code Review
commit d5198cbcce
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

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