Brian Carlstrom
a8355ecaad
am 64f3a191
: Merge "Multilib support for odex"
...
* commit '64f3a191f92a6ab84a8175ad480633b8c58ac900':
Multilib support for odex
2014-05-19 16:53:35 +00:00
Brian Carlstrom
64f3a191f9
Merge "Multilib support for odex"
2014-05-19 16:50:17 +00:00
Ji-Hwan Lee
c0f0e8cab7
am 13b48588
: Merge "Allow qemu_device read-write access to various processes"
...
* commit '13b485889d95597a839f27f7774d55142bb8b5a7':
Allow qemu_device read-write access to various processes
2014-05-19 16:48:51 +00:00
Ji-Hwan Lee
13b485889d
Merge "Allow qemu_device read-write access to various processes"
2014-05-19 16:46:30 +00:00
Ji-Hwan Lee
93e450767f
Allow qemu_device read-write access to various processes
...
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
2014-05-19 20:49:17 +09:00
Ying Wang
b9aa5d43de
Multilib support for odex
...
If the VM is libart and DEXPREOPT is enabled,
- For a Java library and the boot image, we build for both 1st arch and
2nd arch.
- For an app, we build for the multilib arch the module is targeted for.
The odex file will be in <arch_name>/<module_name>.odex inside the same
dir where the jar/apk file gets installed.
Nothing changed if it's built for libdvm.
Bug: 14694978
Change-Id: I45118a83758b41d52d6c9e38f93f0ba2775a6c74
2014-05-18 22:04:58 -07:00
Ji-Hwan Lee
744e4aa228
am e624fd28
: Merge "Put prebuilt emulator path after host output"
...
* commit 'e624fd281a74b42828a1902dfff11503f95fe28d':
Put prebuilt emulator path after host output
2014-05-18 06:50:32 +00:00
Ji-Hwan Lee
acfb27236c
am c60783c9
: Merge "Increase system image size to 650M for generic_arm64"
...
* commit 'c60783c9a291dc03a11326caac920c295ed999dc':
Increase system image size to 650M for generic_arm64
2014-05-18 06:50:32 +00:00
Ji-Hwan Lee
e624fd281a
Merge "Put prebuilt emulator path after host output"
2014-05-18 06:39:50 +00:00
Ji-Hwan Lee
c60783c9a2
Merge "Increase system image size to 650M for generic_arm64"
2014-05-18 06:38:17 +00:00
Ji-Hwan Lee
c89e1826ba
Increase system image size to 650M for generic_arm64
...
Change-Id: I7969ec54dc4225bbe36651c4d9c6a09de1eb89f4
2014-05-18 02:42:14 +09:00
Ying Wang
002f3c2862
am 4636abe5
: Merge "Real "LOCAL_MULTILIB := both" for prebuilts"
...
* commit '4636abe5899272e1e9051e2c98516409107c4e8c':
Real "LOCAL_MULTILIB := both" for prebuilts
2014-05-17 03:06:42 +00:00
Ying Wang
4636abe589
Merge "Real "LOCAL_MULTILIB := both" for prebuilts"
2014-05-17 03:03:44 +00:00
Ying Wang
023209b63e
am 5ee3f096
: Merge "Default TARGET_CPU_SMP to true."
...
* commit '5ee3f0960dbc6a14333e3b98252d59f5d8d18a7d':
Default TARGET_CPU_SMP to true.
2014-05-17 00:09:03 +00:00
Ying Wang
5ee3f0960d
Merge "Default TARGET_CPU_SMP to true."
2014-05-17 00:07:16 +00:00
Ying Wang
d450706704
Default TARGET_CPU_SMP to true.
...
Change-Id: If8c52c8ed66d52452967d09885dfe1ca9da13688
2014-05-16 16:27:11 -07:00
Ying Wang
112786266a
am 3c8089ce
: Merge "Fix the missing 2nd arch prefix."
...
* commit '3c8089cef8eaf90b11852a5c258eba0ff5e3287e':
Fix the missing 2nd arch prefix.
2014-05-16 23:26:31 +00:00
Ying Wang
3c8089cef8
Merge "Fix the missing 2nd arch prefix."
2014-05-16 23:23:16 +00:00
Ying Wang
ef773d22ca
Fix the missing 2nd arch prefix.
...
Bug: 13751317
Change-Id: Ie5a323a0a89245576dbc91271d3178574942627d
2014-05-16 16:22:32 -07:00
Dan Albert
304a7a9fab
am b589679b
: Merge "Use libc++ versions of gtest libs when needed"
...
* commit 'b589679b101e0863a1fd1d7f4fc6ee3370c8a60a':
Use libc++ versions of gtest libs when needed
2014-05-16 22:03:56 +00:00
Dan Albert
b589679b10
Merge "Use libc++ versions of gtest libs when needed"
2014-05-16 22:02:12 +00:00
Dan Albert
9b0c6ff69c
Use libc++ versions of gtest libs when needed
...
Change-Id: Id8752ea946cbaa747dfa4fccf38d680dfeee5b45
2014-05-16 14:55:50 -07:00
Dan Albert
4dd8c9705d
am a82b32a7
: Merge "Use libc++ versions of gtest libs when needed"
...
* commit 'a82b32a7a7855cb93e11e060120803e91cc81c2d':
Use libc++ versions of gtest libs when needed
2014-05-16 21:54:04 +00:00
Dan Albert
a82b32a7a7
Merge "Use libc++ versions of gtest libs when needed"
2014-05-16 21:50:27 +00:00
Dave Allison
330584ee81
Add libsigchain to the embedded.mk makefile
...
This library is used in a LD_PRELOAD environment variable and the linker shows
a warning if it is not present. This change is to added it to all targets so
that the warning is not shown. If ART is not provided on the device this
library has no effect.
Change-Id: I81f01b66fa9c78048534f4bcfc04d62b18057a03
2014-05-16 13:51:36 -07:00
Ying Wang
47316a27ea
am 5137d458
: Merge "Force to build llvm from source in 64-bit host build."
...
* commit '5137d4584e60dea68715dbcae5e276b3af965460':
Force to build llvm from source in 64-bit host build.
2014-05-16 18:59:23 +00:00
Ying Wang
5137d4584e
Merge "Force to build llvm from source in 64-bit host build."
2014-05-16 18:55:48 +00:00
Dan Albert
965bfefb6b
Use libc++ versions of gtest libs when needed
...
Change-Id: I19aa58a83a9da680d441af5f3956a2fbdf18c4e4
2014-05-16 11:22:44 -07:00
Ying Wang
34d5f1b27e
Real "LOCAL_MULTILIB := both" for prebuilts
...
This uses the fact that unsetting LOCAL_MULTILIB equals "either".
It's useful to build for both 32-bit and 64-bit in the same prebuilt
module definition.
Bug: 13751317
Change-Id: I4f1625a83e13f22f807039afebae73f69ed35918
2014-05-16 10:49:57 -07:00
Ying Wang
6374153fbf
Force to build llvm from source in 64-bit host build.
...
Bug: 13751317
Change-Id: I4a4150bfe21607eb7a2342bbd8120b431427eee5
2014-05-16 09:37:23 -07:00
Doug Zongker
c793348298
am c0f10644
: Merge "make SignApk do zip alignment"
...
* commit 'c0f10644bf877fae44e8aa5ebfff41f0e27af197':
make SignApk do zip alignment
2014-05-16 15:59:51 +00:00
Doug Zongker
c0f10644bf
Merge "make SignApk do zip alignment"
2014-05-16 15:56:37 +00:00
Ji-Hwan Lee
658d89e9b5
am 4ec7007f
: Merge "Increase system image size to 650M for generic_x86"
...
* commit '4ec7007f4eac30703cf14b7beaff01a1a07f7eb1':
Increase system image size to 650M for generic_x86
2014-05-16 01:57:36 +00:00
Ji-Hwan Lee
eaf4c7581f
am a7748859
: Merge "Clear *.ini and skin directory on installclean"
...
* commit 'a7748859d741af2f7e22f3333030b937269d33c7':
Clear *.ini and skin directory on installclean
2014-05-16 01:57:35 +00:00
Ji-Hwan Lee
4ec7007f4e
Merge "Increase system image size to 650M for generic_x86"
2014-05-16 01:55:00 +00:00
Ji-Hwan Lee
a7748859d7
Merge "Clear *.ini and skin directory on installclean"
2014-05-16 01:54:49 +00:00
Ying Wang
5b768a7253
am f14653ce
: Merge "x86_common.mk has been replaced by HOST_x86_common.mk"
...
* commit 'f14653cee4c98094d171c194b1af3e14b087ab09':
x86_common.mk has been replaced by HOST_x86_common.mk
2014-05-16 01:54:12 +00:00
Ying Wang
f14653cee4
Merge "x86_common.mk has been replaced by HOST_x86_common.mk"
2014-05-16 01:51:34 +00:00
Ying Wang
a303c4f546
x86_common.mk has been replaced by HOST_x86_common.mk
...
Change-Id: I19eea82bb35d3f65a2d894c687131a1eafbe2cc9
2014-05-15 18:50:06 -07:00
Christopher Ferris
7c67257b8e
am f8cfbc0a
: Merge "Print all 2ND variables."
...
* commit 'f8cfbc0a10b75e6ec22b6e80b90df2a4386887b2':
Print all 2ND variables.
2014-05-16 01:17:13 +00:00
Christopher Ferris
f8cfbc0a10
Merge "Print all 2ND variables."
2014-05-16 01:14:43 +00:00
Ji-Hwan Lee
f942e496a3
Increase system image size to 650M for generic_x86
...
Change-Id: I4457796bdaff8c2626eb0788199be75f3ab4cd47
2014-05-16 08:03:21 +09:00
Doug Zongker
1d67eec191
make SignApk do zip alignment
...
When signing an APK, make the SignApk tool align the stored entries to
(by default) 4-byte boundaries. This obviates the need to run the
separate zipalign tool, which currently does this job.
The alignment byte count can be specified with the -a option. OTA
package signing (with -w) never does alignment.
The order of files in the output APK is changed so that all stored
files come first in the output, followed by all non-stored files.
This is not expected to have any impact in practice.
Change-Id: Iaeef89b2a7283e25fadb99c0a0f0641f682d76b8
2014-05-15 09:54:26 -07:00
Ji-Hwan Lee
9f5d3dde17
Put prebuilt emulator path after host output
...
So that built emulator is used instead of prebuilt one when
BUILD_EMULATOR=true.
Change-Id: I67dfbfc2c3bf9bf051e56de425caa07b08d4b2e4
2014-05-15 22:03:08 +09:00
Ji-Hwan Lee
0a5b178fc3
Clear *.ini and skin directory on installclean
...
Currently, skin directory remains across different emulator targets, and
need manual removal. Also, clear hardware-qemu.ini and config.ini.
(See https://android-review.googlesource.com/94692 for config.ini)
Change-Id: Iaa5849ad043ed3f317325ba1d6df287953636f7a
2014-05-15 20:59:01 +09:00
Narayan Kamath
59f04e889e
am 944a3810
: Merge "Fix executable symlinks."
...
* commit '944a38104a553d84c44fa87b2378ebee66a12349':
Fix executable symlinks.
2014-05-15 09:41:37 +00:00
Narayan Kamath
944a38104a
Merge "Fix executable symlinks."
2014-05-15 09:36:26 +00:00
Christopher Ferris
4fe22ae9e8
Print all 2ND variables.
...
Change-Id: I11180a3ec3481d293100c59c331f05db9e6a689b
2014-05-14 19:16:25 -07:00
Ying Wang
40b49d3043
am a74ade94
: Merge "Support host multilib build"
...
* commit 'a74ade945776e80f99f3b05d06a131cfd353c3f6':
Support host multilib build
2014-05-15 00:41:37 +00:00
Ying Wang
a74ade9457
Merge "Support host multilib build"
2014-05-15 00:37:26 +00:00