tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolved conflicts for merge of 77efd7b4 to master

Browse source 
Change-Id: I2ff1be499d3c4a5c7da3b016c63a519edcda458f
This commit is contained in:
Ian Rogers 2014-04-22 10:03:16 -07:00
commit 2b96d6ae78
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
target/board/generic_x86_64/device.mk
View file

@ -28,7 +28,8 @@ PRODUCT_COPY_FILES := \
frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \
frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml
device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \
system/core/rootdir/init.zygote64.rc:root/init.zygote64.rc
PRODUCT_PACKAGES := \
audio.primary.goldfish \

3
target/product/full_x86_64.mk
View file

@ -23,6 +23,9 @@
# that isn't a wifi connection. This will instruct init.rc to enable the
# network connection so that you can use it with ADB
# Override and force 64-bit Zygote. Must come first.
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk)