am e443a9e9
: Merge "Modify full_mips-eng build in line with the full-eng build"
* commit 'e443a9e92f323bff5bb304e1baf8b00ed18888be': Modify full_mips-eng build in line with the full-eng build
This commit is contained in:
committed by
Android Git Automerger
commit
dd14acc3f6
@@ -51,7 +51,3 @@ 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
|
|
||||||
|
@@ -19,13 +19,17 @@
|
|||||||
|
|
||||||
PRODUCT_PROPERTY_OVERRIDES := \
|
PRODUCT_PROPERTY_OVERRIDES := \
|
||||||
ro.ril.hsxpa=1 \
|
ro.ril.hsxpa=1 \
|
||||||
ro.ril.gprsclass=10
|
ro.ril.gprsclass=10 \
|
||||||
|
ro.adb.qemud=1
|
||||||
|
|
||||||
PRODUCT_COPY_FILES := \
|
PRODUCT_COPY_FILES := \
|
||||||
development/data/etc/apns-conf.xml:system/etc/apns-conf.xml \
|
device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \
|
||||||
development/data/etc/vold.conf:system/etc/vold.conf \
|
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 := \
|
PRODUCT_PACKAGES := \
|
||||||
audio.primary.goldfish \
|
audio.primary.goldfish \
|
||||||
|
power.goldfish \
|
||||||
libffi
|
libffi
|
||||||
|
@@ -19,9 +19,6 @@
|
|||||||
# mips build quite specifically for the emulator, and might not be
|
# mips build quite specifically for the emulator, and might not be
|
||||||
# entirely appropriate to inherit from for on-device configurations.
|
# 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)/product/full_base_telephony.mk)
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_mips/device.mk)
|
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_mips/device.mk)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user