Commit graph

15821 commits

Author SHA1 Message Date
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
Ying Wang
6feb6d5607 Support host multilib build
This change basically ported our target multilib to the host side.
It supports 2 host build modes: x86 and x86_64 multilib build.
For now you need to set "BUILD_HOST_64bit=true" to switch to x86_64
multilib build. Later we'll default to x86_64 build and have a flag
to force 32-bit only build, which may be needed by SDK build.

In host module definition, like in target ones, you can use the
following
LOCAL variables to set up multilib configuration:
LOCAL_MULTILIB: can be "both", "first", "32" or "64".
It also supports the same set of arch or 32-vs-64 specific LOCAL
variables.
By default, it builds only for the first arch.

To keep path compatibility, in x86_64 build files are still output to
out/host/linux-x86; Both 32-bit and 64-bit executables are in
out/host/linux-86/bin;
In x86_64 build 32-bit shared libraries are installed to
out/host/linux-x86/lib32
and 64-bit shared libraries are installed to out/host/linux-x86/lib;
32-bit object files are output to out/host/linux-x86/obj32 and 64-bit
object files
are output to out/host/linux-x86/obj.

Bug: 13751317
Change-Id: I6044f83b7db369a33e05209e8c588eb6dc83409f
2014-05-14 16:55:04 -07:00
Sreeram Ramachandran
6af650d6e3 am da492d7e: Merge "Introduce netd_client, a dynamic library that talks to netd."
* commit 'da492d7ed029b721bef02ca02d98148d5d9f4b3d':
  Introduce netd_client, a dynamic library that talks to netd.
2014-05-14 19:48:13 +00:00
Sreeram Ramachandran
da492d7ed0 Merge "Introduce netd_client, a dynamic library that talks to netd." 2014-05-14 19:42:41 +00:00
Sreeram Ramachandran
a280216494 Introduce netd_client, a dynamic library that talks to netd.
(cherry picked from commit 440de6b9f715cb18b8ee888c58d5c7a659ff5073)

Change-Id: Ib6198e19dbc306521a26fcecfdf6e8424d163fc9
2014-05-14 11:21:01 -07:00
Narayan Kamath
4fb8122bcb Fix executable symlinks.
32 bit targets will leave TARGET_PREFER_{32,64}_BIT_APPS unset
so adjust accordingly. Also clean up an explanatory comment.

Change-Id: I1f6faa640e4e862631fff49f7c565766ef2c567f
2014-05-14 18:26:48 +01:00
Ying Wang
03d02a2687 am b082b5f1: Merge "Disable DEXPREOPT until we have multilib support"
* commit 'b082b5f1b2d1a45ee91de186428d5e341d02c08a':
  Disable DEXPREOPT until we have multilib support
2014-05-13 16:54:29 +00:00
Ying Wang
b082b5f1b2 Merge "Disable DEXPREOPT until we have multilib support" 2014-05-13 16:49:32 +00:00
Ying Wang
a93102d411 Disable DEXPREOPT until we have multilib support
Bug: 14694978
Change-Id: I31d0f1c78a668435646c99e659cec46cd2f3ddf7
2014-05-13 09:46:23 -07:00
Ying Wang
72344a7329 am 8012d8f3: Merge "Treat denver like cortex-a15."
* commit '8012d8f353304ef4487545648455d34d6ffc2741':
  Treat denver like cortex-a15.
2014-05-13 16:34:00 +00:00
Ying Wang
8012d8f353 Merge "Treat denver like cortex-a15." 2014-05-13 16:28:10 +00:00
Ying Wang
fb910ddb1d Treat denver like cortex-a15.
See also build/core/combo/arch/arm/armv7-a-neon.mk.

Change-Id: Ie18e1f133f56a9f7da80e304052c92edad933a31
2014-05-13 09:02:56 -07:00
Andrew Hsieh
e7b99aec67 am fb1f38ec: Merge "Define __USE_MINGW_ANSI_STDIO for windows build"
* commit 'fb1f38ecbacfb5dc2cc4f3f83eb814ac2aa090ca':
  Define __USE_MINGW_ANSI_STDIO for windows build
2014-05-13 00:57:08 +00:00
Andrew Hsieh
fb1f38ecba Merge "Define __USE_MINGW_ANSI_STDIO for windows build" 2014-05-13 00:53:45 +00:00
Ian Rogers
50912342f1 am f544a5f4: Merge "Place ISA in ART boot image name."
* commit 'f544a5f4d57750b569333a59d57f568121f6f4a3':
  Place ISA in ART boot image name.
2014-05-12 23:00:45 +00:00
Ian Rogers
f544a5f4d5 Merge "Place ISA in ART boot image name." 2014-05-12 22:45:54 +00:00
Ian Rogers
334497b8b6 Place ISA in ART boot image name.
Depends upon:
https://android-review.googlesource.com/#/c/94096/2

Change-Id: I79bec60a17ea7cf9214e56f8035d4a1b80b0eeb6
2014-05-12 15:17:25 -07:00
Ying Wang
6c43294059 am dcdc985c: Merge "executable_prefer_symlink: add makefile for creating symlink to prefer version"
* commit 'dcdc985c47338c29e66a22941904abd4171607c9':
  executable_prefer_symlink: add makefile for creating symlink to prefer version
2014-05-12 16:53:01 +00:00
Ying Wang
dcdc985c47 Merge "executable_prefer_symlink: add makefile for creating symlink to prefer version" 2014-05-12 16:49:16 +00:00
Bernhard Rosenkraenzer
d6e11825c4 Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS
Add some more gcc specific flags that are used somewhere in the tree
(e.g. external/chromium_org) to CLANG_CONFIG_UNKNOWN_CFLAGS

Change-Id: Icc572fdb6ea4ba818c4d18e430296589eb61bf55
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
2014-05-12 16:05:14 +02:00
David 'Digit' Turner
9e3259f50d am fb67f05d: Merge changes I53b2ada9,I30794ea5
* commit 'fb67f05d3d6deb2400fd09390550a7858a3c3158':
  Disable emulator from platform builds.
  envsetup.sh: Use prebuilt emulator binaries if available.
2014-05-11 09:19:43 +00:00
David 'Digit' Turner
fb67f05d3d Merge changes I53b2ada9,I30794ea5
* changes:
  Disable emulator from platform builds.
  envsetup.sh: Use prebuilt emulator binaries if available.
2014-05-11 09:16:16 +00:00
Andrew Hsieh
c581e10a2b am eca0043b: Merge "Disable canonical prefixes of system headers"
* commit 'eca0043b869cb10792e2f3e79d4714bde2945bac':
  Disable canonical prefixes of system headers
2014-05-09 16:59:04 +00:00
Andrew Hsieh
eca0043b86 Merge "Disable canonical prefixes of system headers" 2014-05-09 16:55:00 +00:00