summaryrefslogtreecommitdiffstats
path: root/target/board
Commit message (Collapse)AuthorAgeFilesLines
* Build: Increase system image for generic_arm64Andreas Gampe2014-10-031-1/+1
| | | | | | | | | Prebuilts are now preopted. This requires a bump in system image size. Technically a 13M bump would have been fine, but round up to 50M for a little bit of future breathing space. Bug: 17772057 Change-Id: Ib10dc24960c0b2e03ef28c55c3c199382802d4e1
* Remove the vbox target from the build system.Dan Albert2014-09-117-261/+0
| | | | | | | | I've been told this is no longer in use, and it's the only user of external/grub, which is distressingly out of date. Change-Id: I434a55e0d68f6db97fa71e294e983ff1802e9ba6 (cherry picked from commit de21059acf371a58019ef02aa79457923750aa79)
* Change mips64 default to mips64r6 from mips64r2Andrew Hsieh2014-09-041-1/+1
| | | | | | | | | | Also add back mips flags previously can't be handled by clang See aosp/build 13066a8d4c2f8ddb2348e6d3df3948a0f4dbf105 10326b3d7f1966381812ef55478619f714917c23 Change-Id: Iedc8dadd24f72fbd9c5589eec34677c1827290f3
* Add CPU_ABIs for the second generic_arm64 architecture.Narayan Kamath2014-08-191-0/+3
| | | | | | | | | | This was accidentally removed by commit 8dc227f48214dd9c38c82. Breaks builds for apps that use gnustl_static for 32 bit compiles on an arm64 target. bug: 16951392 Change-Id: I89480943284944fd95543cccbf40a8de22852197
* Let aosp_arm64 / emulator assume NEON / cortex-a15.Narayan Kamath2014-08-181-2/+27
| | | | | | | | It's only unbundled app builds that need to assume the worst. bug: 16951392 Change-Id: I5fda39c4132dafa58fefe02b767a4d2a208f3b12
* Merge "Use fonts from generic device for the SDK." into lmp-devDeepanshu Gupta2014-08-101-0/+5
|\
| * Use fonts from generic device for the SDK.Deepanshu Gupta2014-08-091-0/+5
| | | | | | | | | | | | | | | | | | This removes the explicit list of fonts for the SDK and replaces it with the fonts built for the generic device. Also, the symlinked fonts are copied becuase Windows doesn't support symlinks. Change-Id: I8b18b2ab0149ab24448f27dbd5f9716e5d360029
* | Make the 32-bit architecture for arm64 generic.Narayan Kamath2014-08-081-2/+2
|/ | | | | | | | The idea is that we want to be able to build a single 32+64 APK whose 32 bit code can run on 32 bit devices, where we can't assume cortex-a15 or NEON. Change-Id: Ia6bf400fa472924a94b08cef83e9e5dea09222ab
* [MIPSR6] Add mips64r6 and mips32r6 targetsDuane Sand2014-08-051-0/+4
| | | | | | | | | | | | | Add mips64r6 target and corresponding mips32r6 target. Defaults remain as mips64r2 and mips32r2. Apply -FP64A codegen subsetting to mips32r6 only. Access FR=0 odd-numbered 32-bit float regs only via double-prec even-numbered regs, not by single-prec ops. (cherry picked from commit 6bab974cdc90cb3a7514c7255b6e6adfb9c98e2b) Change-Id: I447337ce56c15e86cec505d68a6b45294fc3ba77
* [MIPS64] Enable mips64 clangDuane Sand2014-08-051-1/+1
| | | | | | (cherry picked from commit 41ca4446370ba90e472e45a8897868855185a6c7) Change-Id: I0b141c58c88fe86e3a59844f53acc9a0e0a5271c
* [MIPS] Unite mipsel and mips64el 4.9 gcc toolchainsDuane Sand2014-08-051-17/+0
| | | | | | | | | | | | | | Use 4.9 mips64el toolchain for both 64- and 32-bit builds. Tell ld when 32-bit links are required. Override 4.9's changed defaults for mips floating point register use, to get same assembler rules as 4.8 and earlier. Also: drop unused soft-fp build targets, cleanout redundant compiler options, and remove extraneous Android.mk file. (cherry picked from commit 6670e24aed1ca66f21a6af759a0d156bb3df1739) Change-Id: I34d2f8fc6113c9d1670e3acff1aff48634b9fe1b
* am 515907a9: am 696f9d3e: am e0be9135: Merge "Bump ↵Brian Carlstrom2014-06-201-1/+1
|\ | | | | | | | | | | | | BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64" * commit '515907a98c3ddff2be42479364fd685103d06fe2': Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64
| * Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64Brian Carlstrom2014-06-201-1/+1
| | | | | | | | Change-Id: Ia856159017f6228dbfd5a7100e3731b82e6e8fe4
* | am f9172a61: am 2eb95ac2: am ad6107c3: Merge "Coalesce generic_x86 and ↵Nick Kralevich2014-06-179-19/+4
|\ \ | |/ | | | | | | | | | | generic sepolicy where possible." * commit 'f9172a61d742ac048fced2c264585068a42527b3': Coalesce generic_x86 and generic sepolicy where possible.
| * Coalesce generic_x86 and generic sepolicy where possible.Stephen Smalley2014-06-179-19/+4
| | | | | | | | | | | | | | | | | | We originally forked a complete copy of generic/sepolicy into generic_x86/sepolicy, but we can instead inherit from it and merely add rules as needed under generic_x86/sepolicy. Change-Id: I21e1a1425ce08676a8ea69685a4761db3bfde628 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | am 7be1a519: am 331f4d58: am cc7aebb8: Merge "Restore generic_x86 sepolicy ↵Nick Kralevich2014-06-171-1/+2
|\ \ | |/ | | | | | | | | | | zygote.te file." * commit '7be1a5197ffb97aebc8a175b7a5dcbed248ac8a7': Restore generic_x86 sepolicy zygote.te file.
| * Restore generic_x86 sepolicy zygote.te file.Stephen Smalley2014-06-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I87d0976800557d73064e2da038315b0d019d7a60 removed zygote.te from generic/sepolicy and generic/BoardConfig.mk but also incorrectly removed it from generic_x86/BoardConfig.mk, even though generic_x86/sepolicy/zygote.te still exists and contains rules needed on the x86 emulator. Otherwise the zygote fails with execmem denials on the x86 emulator. (x86 emulator is also broken currently due to yaffs2 /cache yielding unlabeled denials, but that is unrelated to this change). Change-Id: Ie36ed4ed7ba478a377f9a0d4383d006b49bde5cc Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | am cac1fc6d: am 5bb6eeb9: am d9c312b5: Merge "Allow all domains access to ↵dcashman2014-06-1721-30/+4
|\ \ | |/ | | | | | | | | | | /dev/qemu_trace." * commit 'cac1fc6dd5daf5f03bacf8749f888d196985fda8': Allow all domains access to /dev/qemu_trace.
| * Allow all domains access to /dev/qemu_trace.dcashman2014-06-1621-30/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /dev/qemu_trace is used by memcheck on qemu to get memory allocation events from all processes on the system. Allow all domains to access this device, and other qemu-specific devices. Addresses the following denials: type=1400 audit(1402674828.500:3): avc: denied { read write } for pid=44 comm="servicemanager" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:servicemanager:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674828.500:4): avc: denied { open } for pid=44 comm="servicemanager" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:servicemanager:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674828.520:5): avc: denied { read write } for pid=42 comm="logd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:logd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674828.520:6): avc: denied { open } for pid=42 comm="logd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:logd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674828.610:7): avc: denied { read write } for pid=48 comm="debuggerd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:debuggerd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674828.610:8): avc: denied { open } for pid=48 comm="debuggerd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:debuggerd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674829.000:9): avc: denied { read write } for pid=47 comm="netd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674829.000:10): avc: denied { open } for pid=47 comm="netd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674829.180:11): avc: denied { read write } for pid=53 comm="installd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:installd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674829.200:12): avc: denied { read write } for pid=45 comm="vold" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:vold:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674829.200:13): avc: denied { open } for pid=53 comm="installd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:installd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674829.200:14): avc: denied { open } for pid=45 comm="vold" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:vold:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674829.280:15): avc: denied { read write } for pid=54 comm="keystore" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:keystore:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674829.280:16): avc: denied { open } for pid=54 comm="keystore" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:keystore:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674830.580:17): avc: denied { read write } for pid=51 comm="drmserver" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:drmserver:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674830.580:18): avc: denied { open } for pid=51 comm="drmserver" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:drmserver:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674930.860:22): avc: denied { read write } for pid=655 comm="iptables" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674930.870:23): avc: denied { open } for pid=655 comm="iptables" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file Bug: 15570479 Change-Id: I87d0976800557d73064e2da038315b0d019d7a60
| * Revert "Allow all domains access to /dev/qemu_trace."dcashman2014-06-1621-4/+28
| | | | | | | | This reverts commit b1b12f8ad49ecbba7dd6b9db2a0ca8fafa532d82.
* | Revert "Allow all domains access to /dev/qemu_trace."dcashman2014-06-1621-4/+28
| | | | | | | | | | | | | | | | This reverts commit b1b12f8ad49ecbba7dd6b9db2a0ca8fafa532d82. (cherry picked from commit 097e840b062b5191dac757dc998cd072ac7f308a) Change-Id: I89a9a0879a415c177091852a579c6dfd8c8a5b0a
* | am 3aeceecd: am cd978db2: am 96df14d6: Merge "Allow all domains access to ↵dcashman2014-06-1621-28/+4
|\ \ | |/ | | | | | | | | | | /dev/qemu_trace." * commit '3aeceecddf2c7ee7f785e7e16c54d8bb99e3c9f1': Allow all domains access to /dev/qemu_trace.
| * Allow all domains access to /dev/qemu_trace.dcashman2014-06-1621-28/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /dev/qemu_trace is used by memcheck on qemu to get memory allocation events from all processes on the system. Allow all domains to access this device, and other qemu-specific devices.. Addresses the following denials: type=1400 audit(1402674828.500:3): avc: denied { read write } for pid=44 comm="servicemanager" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:servicemanager:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674828.500:4): avc: denied { open } for pid=44 comm="servicemanager" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:servicemanager:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674828.520:5): avc: denied { read write } for pid=42 comm="logd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:logd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674828.520:6): avc: denied { open } for pid=42 comm="logd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:logd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674828.610:7): avc: denied { read write } for pid=48 comm="debuggerd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:debuggerd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674828.610:8): avc: denied { open } for pid=48 comm="debuggerd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:debuggerd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674829.000:9): avc: denied { read write } for pid=47 comm="netd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674829.000:10): avc: denied { open } for pid=47 comm="netd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674829.180:11): avc: denied { read write } for pid=53 comm="installd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:installd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674829.200:12): avc: denied { read write } for pid=45 comm="vold" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:vold:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674829.200:13): avc: denied { open } for pid=53 comm="installd" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:installd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674829.200:14): avc: denied { open } for pid=45 comm="vold" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:vold:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674829.280:15): avc: denied { read write } for pid=54 comm="keystore" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:keystore:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674829.280:16): avc: denied { open } for pid=54 comm="keystore" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:keystore:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674830.580:17): avc: denied { read write } for pid=51 comm="drmserver" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:drmserver:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674830.580:18): avc: denied { open } for pid=51 comm="drmserver" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:drmserver:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674930.860:22): avc: denied { read write } for pid=655 comm="iptables" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file type=1400 audit(1402674930.870:23): avc: denied { open } for pid=655 comm="iptables" name="qemu_trace" dev="tmpfs" ino=1494 scontext=u:r:netd:s0 tcontext=u:object_r:qemu_device:s0 tclass=chr_file Bug: 15570479 Change-Id: I4999a1eb5c25b4238c53fe1e989bcf5fed1ae355
* | am b3529761: am 2d4a27ee: am d707b5aa: Merge "AArch64: Set ↵Ying Wang2014-06-111-1/+1
|\ \ | |/ | | | | | | | | | | TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15" * commit 'b3529761af24d19cd8cefa2c93f91920f0dfb28f': AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15
| * AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15Serban Constantinescu2014-06-041-1/+1
| | | | | | | | | | | | | | | | | | A sensible default for the 32bit CPU_VARIANT of an ARM64 build is cortex-a15. Please note that the AArch32 execution state of ARMv8 is a superset of ARMv7. Change-Id: Id2b655172750e04609ae9ba22d621fe83cd69b1a Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
* | am 55b2c360: am ad319779: am 4afe808c: Merge "Fix all the system image sizes."Elliott Hughes2014-05-283-3/+3
|\ \ | |/ | | | | | | * commit '55b2c3600fcbdc6bd0dbf3319eb219188553429c': Fix all the system image sizes.
| * Fix all the system image sizes.Elliott Hughes2014-05-273-3/+3
| | | | | | | | | | | | | | | | x86 just bit me. I did manage to build mips today, but I assume it can't be long before we hit the limit there too if every other target has hit it already. Change-Id: I28dfe3b4f9565cb79e0bf6b0ffc55a9d6e64a9b0
* | resolved conflicts for merge of 38c3c930 to masterNarayan Kamath2014-05-271-2/+1
|\ \ | |/ | | | | Change-Id: I88bb5131ce15bc5a4d7a7870d33c78fc9d952bb2
| * Switch x86_64 emulator to 64 bit primary.Narayan Kamath2014-05-271-2/+1
| | | | | | | | | | | | | | | | | | Also siezes the opportunity to remove the hardcoded TARGET_PREFER_32_BIT_APPS directing in core_64_bit.mk. This avoids the need for further hacks but needs supporting changes to a few apps to force them to 32 bit. Change-Id: I36ba9e5f5b08dd87d6a4afc27961a436306eed99
* | am d72b3164: am e972f9ff: am 0dbcff95: Merge "The generic_arm64 system image ↵Elliott Hughes2014-05-211-1/+1
|\ \ | |/ | | | | | | | | | | is full." * commit 'd72b3164bdb731dd9871b221fe8db099a1f94514': The generic_arm64 system image is full.
| * The generic_arm64 system image is full.Elliott Hughes2014-05-201-1/+1
| | | | | | | | Change-Id: I454c674033525f2f7847d2c91979dff8093c335b
* | am d9f11a3f: am c0f0e8ca: am 13b48588: Merge "Allow qemu_device read-write ↵Ji-Hwan Lee2014-05-1910-1/+14
|\ \ | |/ | | | | | | | | | | access to various processes" * commit 'd9f11a3f2b0670ac68bfae782c5fe8c58032efc6': Allow qemu_device read-write access to various processes
| * Allow qemu_device read-write access to various processesJi-Hwan Lee2014-05-1910-1/+14
| | | | | | | | | | | | | | | | | | Basically, allow access of qemu_device where gpu_device is allowed, for the case when the emulator runs with OpenGL/ES emulation. Most noticably, surfaceflinger crashes without qemu_device access. Bug: 15052949 Change-Id: Ib891365a6d503309bced64e2512c4d8f29d9a07e
* | am 38c18c3b: am acfb2723: am c60783c9: Merge "Increase system image size to ↵Ji-Hwan Lee2014-05-181-1/+1
|\ \ | |/ | | | | | | | | | | 650M for generic_arm64" * commit '38c18c3b9adca416517fb332628253e2bb43fe23': Increase system image size to 650M for generic_arm64
| * Increase system image size to 650M for generic_arm64Ji-Hwan Lee2014-05-181-1/+1
| | | | | | | | Change-Id: I7969ec54dc4225bbe36651c4d9c6a09de1eb89f4
* | am 0994317a: am 658d89e9: am 4ec7007f: Merge "Increase system image size to ↵Ji-Hwan Lee2014-05-161-1/+1
|\ \ | |/ | | | | | | | | | | 650M for generic_x86" * commit '0994317a003a8e3e1891d4f3ae44fcfc3191b2bf': Increase system image size to 650M for generic_x86
| * Increase system image size to 650M for generic_x86Ji-Hwan Lee2014-05-161-1/+1
| | | | | | | | Change-Id: I4457796bdaff8c2626eb0788199be75f3ab4cd47
* | am 873782cc: am 9e3259f5: am fb67f05d: Merge changes I53b2ada9,I30794ea5David 'Digit' Turner2014-05-111-1/+0
|\ \ | |/ | | | | | | | | * commit '873782ccd44349c766f5d74e65b3b323618dd6ed': Disable emulator from platform builds. envsetup.sh: Use prebuilt emulator binaries if available.
| * Disable emulator from platform builds.David 'Digit' Turner2014-05-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Now that emulator prebuilts are available under prebuilts/android-emulator/, disable building the emulator from source in all platform builds, except if one defines BUILD_EMULATOR to 'true' in its environment. NOTE: This patch should be applied after this one to avoid issues with the GPU emulation libraries: https://android-review.googlesource.com/93980 Change-Id: I53b2ada9ca0c2e159dccee7cdca7f55f6b0d1d42
* | am c0d50f62: am 5bd1da1e: am 41d8760d: Merge "Bump userdata image size from ↵Tsu Chiang Chuang2014-05-085-5/+5
|\ \ | |/ | | | | | | | | | | 200 MB to 550 MB" * commit 'c0d50f6295e9c552456c825f9c8045dced05a409': Bump userdata image size from 200 MB to 550 MB
| * Bump userdata image size from 200 MB to 550 MBTsu Chiang Chuang2014-05-065-5/+5
| | | | | | | | Change-Id: Ibdf319091a7187dc894f4a923d40868cec4b7b41
* | am 876dca69: am 2c32044d: am b7e0bdc0: Merge "Increase system image size of ↵Ying Wang2014-05-061-1/+1
|\ \ | |/ | | | | | | | | | | generic_x86_64 to 750MB." * commit '876dca695d1be00054fe7c4b5ac4e7c36b6c1eb9': Increase system image size of generic_x86_64 to 750MB.
| * Increase system image size of generic_x86_64 to 750MB.Ying Wang2014-05-051-1/+1
| | | | | | | | Change-Id: I0c3264c7f629bc4d8c30539590de00967188807b
* | am 0049c40e: am 54a570bd: am 57df0c7b: Merge "Increase system image size of ↵Ying Wang2014-05-051-1/+1
|\ \ | |/ | | | | | | | | | | generic_x86_64 to 650MB." * commit '0049c40efd053d0fae186515e7cfc3fc0671c4cd': Increase system image size of generic_x86_64 to 650MB.
| * Increase system image size of generic_x86_64 to 650MB.Ying Wang2014-05-051-1/+1
| | | | | | | | Change-Id: Iacf6dcd00d78039d1b19595db6f293f8f202ac5a
* | resolved conflicts for merge of 77efd7b4 to masterIan Rogers2014-04-221-1/+2
|\ \ | |/ | | | | Change-Id: I2ff1be499d3c4a5c7da3b016c63a519edcda458f
| * Make the zygote 64-bit for the x86-64 emulator.Ian Rogers2014-04-181-1/+2
| | | | | | | | Change-Id: I4ad5d1ef2406e947176c8e180822b25c04fc83f0
* | am 0fd37501: am f518e838: am f1750876: Merge "Revert "HACK: disable emulator ↵Greg Hackmann2014-04-031-2/+2
|\ \ | |/ | | | | | | | | | | on x86_64"" * commit '0fd37501c4610783c53a6f8d4000ba7a230f61df': Revert "HACK: disable emulator on x86_64"
| * Merge "Revert "HACK: disable emulator on x86_64""Greg Hackmann2014-04-021-2/+2
| |\
| | * Revert "HACK: disable emulator on x86_64"Greg Hackmann2014-03-311-2/+2
| | | | | | | | | | | | This reverts commit 4562c5bcb355c87a18e811ba8e6c2b6451a3ebf7.