diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-06-12 08:05:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-12 08:05:22 -0700 |
| commit | ddb706785bd96fe7b450779ab41d1276939ee9fa (patch) | |
| tree | c69b033863d9c3592e906216a679c7ed2671dff8 /target | |
| parent | 40b72470c1c65d1febf18d3c5731bb4d2d27a284 (diff) | |
| parent | 5b7633be4e107888db7b6fc3d50be6aa8eb7f95c (diff) | |
| download | build-ddb706785bd96fe7b450779ab41d1276939ee9fa.zip build-ddb706785bd96fe7b450779ab41d1276939ee9fa.tar.gz build-ddb706785bd96fe7b450779ab41d1276939ee9fa.tar.bz2 | |
am 5b7633be: am 06e515dd: Merge "This patch addresses the following issues:"
* commit '5b7633be4e107888db7b6fc3d50be6aa8eb7f95c':
This patch addresses the following issues:
Diffstat (limited to 'target')
| -rw-r--r-- | target/board/generic_mips/BoardConfig.mk | 6 | ||||
| -rw-r--r-- | target/board/generic_mips/device.mk | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/target/board/generic_mips/BoardConfig.mk b/target/board/generic_mips/BoardConfig.mk index 722e112..8b81c27 100644 --- a/target/board/generic_mips/BoardConfig.mk +++ b/target/board/generic_mips/BoardConfig.mk @@ -26,7 +26,7 @@ TARGET_ARCH := mips ifeq (,$(TARGET_ARCH_VARIANT)) TARGET_ARCH_VARIANT := mips32r2-fp endif -GET_CPU_ABI := mips +TARGET_CPU_ABI := mips HAVE_HTC_AUDIO_DRIVER := 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, # the GLES renderer disables itself if host GL acceleration isn't available. USE_OPENGL_RENDERER := true + +# Default to JSC until we get v8 landed +HTTP := android +JS_ENGINE := jsc diff --git a/target/board/generic_mips/device.mk b/target/board/generic_mips/device.mk index bd08fde..6edcba6 100644 --- a/target/board/generic_mips/device.mk +++ b/target/board/generic_mips/device.mk @@ -27,4 +27,5 @@ PRODUCT_COPY_FILES := \ development/tools/emulator/system/camera/media_profiles.xml:system/etc/media_profiles.xml PRODUCT_PACKAGES := \ - audio.primary.goldfish + audio.primary.goldfish \ + libffi |