Merge "This patch addresses the following issues:"

This commit is contained in:
Jean-Baptiste Queru
2012-06-12 07:47:48 -07:00
committed by android code review
2 changed files with 7 additions and 2 deletions

View File

@@ -26,7 +26,7 @@ TARGET_ARCH := mips
ifeq (,$(TARGET_ARCH_VARIANT)) ifeq (,$(TARGET_ARCH_VARIANT))
TARGET_ARCH_VARIANT := mips32r2-fp TARGET_ARCH_VARIANT := mips32r2-fp
endif endif
GET_CPU_ABI := mips TARGET_CPU_ABI := mips
HAVE_HTC_AUDIO_DRIVER := true HAVE_HTC_AUDIO_DRIVER := true
BOARD_USES_GENERIC_AUDIO := true BOARD_USES_GENERIC_AUDIO := true
@@ -51,3 +51,7 @@ BUILD_EMULATOR_OPENGL := true
# Build and enable the OpenGL ES View renderer. When running on the emulator, # Build and enable the OpenGL ES View renderer. When running on the emulator,
# the GLES renderer disables itself if host GL acceleration isn't available. # the GLES renderer disables itself if host GL acceleration isn't available.
USE_OPENGL_RENDERER := true USE_OPENGL_RENDERER := true
# Default to JSC until we get v8 landed
HTTP := android
JS_ENGINE := jsc

View File

@@ -27,4 +27,5 @@ PRODUCT_COPY_FILES := \
development/tools/emulator/system/camera/media_profiles.xml:system/etc/media_profiles.xml development/tools/emulator/system/camera/media_profiles.xml:system/etc/media_profiles.xml
PRODUCT_PACKAGES := \ PRODUCT_PACKAGES := \
audio.primary.goldfish audio.primary.goldfish \
libffi