diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-06-12 07:47:48 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-06-12 07:47:49 -0700 |
| commit | 06e515dd77731c1752b2ea3b1b586bcd893f0927 (patch) | |
| tree | 9bd33df276b2373e2d8813bd62252eba8dadfece | |
| parent | 874563f92e18d54d9088408104cc28d35971f189 (diff) | |
| parent | f70dec9281acd6f7601efd6e6294afbd28e03437 (diff) | |
| download | build-06e515dd77731c1752b2ea3b1b586bcd893f0927.tar.gz | |
Merge "This patch addresses the following issues:"
| -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 722e112e4f..8b81c274c5 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 bd08fdebaf..6edcba63ff 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 |