Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000

Required for getting ART with valgrind on device working since
valgrind maps things in the 0x60000000 address range.

Bug: 13323732

Change-Id: I05efdbf3fe5acd1418e1d4ced5844154fb4c5d37
Specify -mcpu=cortex-a15 for denver CPU variants.

Change-Id: Ic27484c92a48b45148021a61420ffdd55a9dd945
add support for LOCAL_MULTILIB

LOCAL_MULTILIB replaces LOCAL_32_BIT_ONLY and
LOCAL_NO_2ND_ARCH, although both are still supported.

Set LOCAL_MULTILIB := 32 to always build a module 32-bit.
This is the same as specifying LOCAL_32_BIT_ONLY.

Set LOCAL_MULTILIB := first to always build a module for
the first architecture (64-bit on a 64-bit target, 32-bit on a
32-bit target).  This is the same as specifying LOCAL_NO_2ND_ARCH.

Set LOCAL_MULTILIB := both to build for both architectures
on a mulitlib (64-bit) target.

If LOCAL_MULTILIB is not set libraries will default to "both",
and executables, packages, and prebuilts will default to building
for the first architecture if supported by the module, otherwise
the second.

Executables that set LOCAL_MULTILIB := both must set either
LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64 or
LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 to specify how to
differentiate the install locations of the two versions.

Change-Id: I22ab6aa342b231c307b1d8a86cea4fd91eea39f5
Merge "add support for LOCAL_MULTILIB"
Increase the maximum javac heap size.

Java 7 needs more memory when you run some annotation tools.

Change-Id: Ia8b423244b9ce164500b24867fe2b3d10a5089ff
Merge "Increase the maximum javac heap size."
Extend the CPU ABI specification mechanism.

Add a (read only) system property that is a comma
separated list of ABIs supported by the device in order
of preference. For example, typical arm-v8 device might
define:

ro.cpu.abilist = arm64-v8a,armeabi-v7a,armeabi

For most purposes, a single flattened list like the above is
probably more useful than the parallel system of variables
TARGET_CPU_ABI{2} / TARGET_2ND_ARCH_CPU_ABI{2} that we use
in the build system.

Change-Id: If9102669ad9f5f8fd89a8bcc5bf88cca1acadc3c
Merge "Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000"
Remove the unnecessary indirection of TARGET_STRIP_COMMAND

Now all archs use the same strip command which can be put just in
transform-to-stripped.

Change-Id: Ief79697d47ea142fc9e63e63a7e2dace9e839165
Add a default value for ro.zygote.

Also makes sure the correct init config file is
copied across.

Change-Id: I281d00dab17f780bda21bf3fbc35418df18dffb1
Merge "Extend the CPU ABI specification mechanism."
Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND"
Merge "Specify -mcpu=cortex-a15 for denver CPU variants."
Fix java version detection when _JAVA_OPTIONS is set.

_JAVA_OPTIONS is an environment variable that
can be used to affect the behavior of java and javac.
It is currently required to get Android to build on
some configurations, where the default Java heap size
is too small. Unfortunately, if _JAVA_OPTIONS is set,
both java and javac will output its value to the console
as the first line on every invocation, including trivial
ones like java -version. This will confuse main.mk’s
version detection, which only looks at the first line of
output. Tweak the version detection to run grep before
head, so that the _JAVA_OPTIONS line is filtered by the grep.

Change-Id: I69aee52b56d27711b7d3087ec6b3ebab07ffc3af
Merge "Fix java version detection when _JAVA_OPTIONS is set."
Revert "HACK: disable emulator on x86_64"

This reverts commit 4562c5bcb355c87a18e811ba8e6c2b6451a3ebf7.
Add intel to the vendor whitelist

Change-Id: I91d6ff72629523050b4f26c2d731cac90ef49348
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Reviewed-by: Jovanovic, Radivoje <radivoje.jovanovic@intel.com>
Reviewed-by: Boie, Andrew P <andrew.p.boie@intel.com>
Reviewed-by: Kumar-mayernik, Nisha <nisha.kumar-mayernik@intel.com>
Reviewed-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
Tested-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
Merge "Add intel to the vendor whitelist"
Use debug versions of dex2oat explicitly.

Change-Id: Ie7c238908a5739af752a08fec1a04914026a8f96
Bring main.mk in sync with master.

These lines were removed in aosp in commit e2d27887b
but a bad merge conflict resolution left them in master.

Subsequent changes on master started using these variables
so they're being brought back.

Change-Id: Ic8f3c295130c47eb0d66057880f9d4f70c89af94