diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-10 12:42:18 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-08-10 12:42:18 -0700 |
| commit | 91afae6c039d06df83d708834c96d47858406e2a (patch) | |
| tree | 199789c202d963438d19e43340c269baa9065927 /target | |
| parent | baa97012143a8601aff04428a179446d8182a4a4 (diff) | |
| parent | dd14acc3f665e83ee5da1cd300606c14a5513ae8 (diff) | |
| download | build-91afae6c039d06df83d708834c96d47858406e2a.zip build-91afae6c039d06df83d708834c96d47858406e2a.tar.gz build-91afae6c039d06df83d708834c96d47858406e2a.tar.bz2 | |
resolved conflicts for merge of dd14acc3 to jb-mr1-dev
Change-Id: Ic900c623a7c7fd20c965b8d838caf0f01ceab53f
Diffstat (limited to 'target')
| -rw-r--r-- | target/board/generic_mips/BoardConfig.mk | 4 | ||||
| -rw-r--r-- | target/board/generic_mips/device.mk | 8 | ||||
| -rw-r--r-- | target/product/full_mips.mk | 3 |
3 files changed, 6 insertions, 9 deletions
diff --git a/target/board/generic_mips/BoardConfig.mk b/target/board/generic_mips/BoardConfig.mk index 8b81c27..8c2371f 100644 --- a/target/board/generic_mips/BoardConfig.mk +++ b/target/board/generic_mips/BoardConfig.mk @@ -51,7 +51,3 @@ 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 eaaff80..8c770b5 100644 --- a/target/board/generic_mips/device.mk +++ b/target/board/generic_mips/device.mk @@ -19,13 +19,17 @@ PRODUCT_PROPERTY_OVERRIDES := \ ro.ril.hsxpa=1 \ - ro.ril.gprsclass=10 + ro.ril.gprsclass=10 \ + ro.adb.qemud=1 PRODUCT_COPY_FILES := \ device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ device/generic/goldfish/data/etc/vold.conf:system/etc/vold.conf \ - development/tools/emulator/system/camera/media_profiles.xml:system/etc/media_profiles.xml + $(call add-to-product-copy-files-if-exists,development/tools/emulator/system/camera/media_profiles.xml:system/etc/media_profiles.xml) \ + $(call add-to-product-copy-files-if-exists,development/tools/emulator/system/camera/media_codecs.xml:system/etc/media_codecs.xml) \ + hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf PRODUCT_PACKAGES := \ audio.primary.goldfish \ + power.goldfish \ libffi diff --git a/target/product/full_mips.mk b/target/product/full_mips.mk index 886cf31..2debfec 100644 --- a/target/product/full_mips.mk +++ b/target/product/full_mips.mk @@ -19,9 +19,6 @@ # mips build quite specifically for the emulator, and might not be # entirely appropriate to inherit from for on-device configurations. -PRODUCT_PACKAGES := \ - Camera - $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_mips/device.mk) |