Commit Graph

15076 Commits

Author SHA1 Message Date
Narayan Kamath 81fc969b65 am cf352c5d: Merge "Add warning message for java6 builds."
* commit 'cf352c5d7e1482cc80be4eb2bbe99041a2345f8e':
  Add warning message for java6 builds.
2014-04-02 12:23:28 +00:00
Narayan Kamath cf352c5d7e Merge "Add warning message for java6 builds." 2014-04-02 12:19:49 +00:00
Narayan Kamath bee0ec4196 Add warning message for java6 builds.
The instruction URL has been amended and a few additional
details have been added.

(cherry picked from 8c06afdea3)

Change-Id: Icaffc3b13ed881ac7e29f2021ed31eb1f877a5ab
2014-04-02 13:16:15 +01:00
Narayan Kamath 3520076298 am e28df19e: Merge "Call "java[c] -version" only once"
* commit 'e28df19e0e553f1590e304c02b19559dbee48098':
  Call "java[c] -version" only once
2014-04-02 10:51:15 +00:00
Narayan Kamath 0239220a67 am 2f5de9f5: Merge "Bring main.mk in sync with master."
* commit '2f5de9f50460bbd369abd4218e746553f15f24fb':
  Bring main.mk in sync with master.
2014-04-02 10:51:14 +00:00
Narayan Kamath e28df19e0e Merge "Call "java[c] -version" only once" 2014-04-02 10:48:34 +00:00
Ying Wang 8d45e51803 Call "java[c] -version" only once
and print out the full output if error occurs.
Bug: 11672548

(cherry picked from 7b66d366bf)

Change-Id: I8e2f2ffa2f28146405273b04667efe3c8d1c03ad
2014-04-02 10:45:17 +00:00
Narayan Kamath 2f5de9f504 Merge "Bring main.mk in sync with master." 2014-04-02 10:45:07 +00:00
Nicolas Geoffray 4ca6e2e528 am 38c0ac73: Merge "Use debug versions of dex2oat explicitly."
* commit '38c0ac7386f1956cf06079960886275c483e0706':
  Use debug versions of dex2oat explicitly.
2014-04-02 08:50:03 +00:00
Nicolas Geoffray 38c0ac7386 Merge "Use debug versions of dex2oat explicitly." 2014-04-02 08:45:56 +00:00
Dmitriy Ivanov 836950372b am e44e8b0f: Merge "Remove redundant my_target_global_ldflags"
* commit 'e44e8b0fbeaa52a3ff2ac84d6a804a2883103d7e':
  Remove redundant my_target_global_ldflags
2014-04-01 23:55:45 +00:00
Dmitriy Ivanov e44e8b0fbe Merge "Remove redundant my_target_global_ldflags" 2014-04-01 23:51:11 +00:00
Dmitriy Ivanov 00479a9fe0 Remove redundant my_target_global_ldflags
* Fix: my_target_global_ldflags is defined in binary.mk
    so they effectivelly override previous definition

Change-Id: I9c7d9bde82c3a6d25a94ae109fa71ecaa33640b0
2014-04-01 16:36:21 -07:00
Tim Murray 0cad8ee222 am 572e9acc: Merge "Always use prebuilt clang, even if we\'re explicitly building clang/LLVM."
* commit '572e9accc05c467d74d3f4fbf2dbc05b8424e302':
  Always use prebuilt clang, even if we're explicitly building clang/LLVM.
2014-04-01 23:28:58 +00:00
Tim Murray 572e9accc0 Merge "Always use prebuilt clang, even if we're explicitly building clang/LLVM." 2014-04-01 23:24:56 +00:00
Tim Murray 125a3c9fb0 Always use prebuilt clang, even if we're explicitly building clang/LLVM.
This is needed for self-hosting Clang/LLVM.

bug 13588226

Change-Id: Ic98adc2b174b12ce046b7b65bbc28901a766a485
2014-04-01 16:08:51 -07:00
Brian Carlstrom 5e5d26b1ef am 47e60739: Merge "cortex-a7 supports div"
* commit '47e6073979254ef4fbc60554079b2bf19ac32ab1':
  cortex-a7 supports div
2014-04-01 18:23:35 +00:00
Brian Carlstrom 47e6073979 Merge "cortex-a7 supports div" 2014-04-01 18:11:23 +00:00
Brian Carlstrom 49c80cd9b6 cortex-a7 supports div
(cherry picked from commit cece45d226)

Change-Id: I9975171ef2c2cd3a9481fa0896473fec684095f3
2014-04-01 10:25:59 -07:00
Narayan Kamath 2c9552b784 am aafbbe7e: Merge "Add a default value for ro.zygote."
* commit 'aafbbe7e8a3a8056c483b6b516c4900cbd3b095e':
  Add a default value for ro.zygote.
2014-04-01 16:26:40 +00:00
Narayan Kamath aafbbe7e8a Merge "Add a default value for ro.zygote." 2014-04-01 16:21:58 +00:00
Narayan Kamath d5fb782682 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
2014-04-01 13:13:13 +01:00
Nicolas Geoffray ed154c3ba6 Use debug versions of dex2oat explicitly.
Change-Id: Ie7c238908a5739af752a08fec1a04914026a8f96
2014-04-01 08:43:26 +01:00
Ying Wang 9cfefe13ae am 6a9f2b12: Merge "Add intel to the vendor whitelist"
* commit '6a9f2b1250e276267ce146777fbe6084f8fa7a3f':
  Add intel to the vendor whitelist
2014-04-01 02:58:51 +00:00
Ying Wang 6a9f2b1250 Merge "Add intel to the vendor whitelist" 2014-04-01 02:51:50 +00:00
Daniel Leung 625974cf2a 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>
2014-04-01 10:38:12 +08:00
Ying Wang 4714d3d7a6 am b34af41e: Merge "Fix java version detection when _JAVA_OPTIONS is set."
* commit 'b34af41e578b1bbc02470d01593c45fe8b04588b':
  Fix java version detection when _JAVA_OPTIONS is set.
2014-04-01 00:11:00 +00:00
Ying Wang b34af41e57 Merge "Fix java version detection when _JAVA_OPTIONS is set." 2014-03-31 23:53:52 +00:00
Peter Ammon bb406bf4c0 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
2014-03-31 15:36:02 -07:00
Christopher Ferris 2d0ecc1b00 am 0c4870a4: Merge "Specify -mcpu=cortex-a15 for denver CPU variants."
* commit '0c4870a4cdefb9a0062d2fc1dbf4cdce5bd2cd4c':
  Specify -mcpu=cortex-a15 for denver CPU variants.
2014-03-31 19:11:30 +00:00
Christopher Ferris 0c4870a4cd Merge "Specify -mcpu=cortex-a15 for denver CPU variants." 2014-03-31 19:06:28 +00:00
Ying Wang 30dbfa43ef am 1c380c13: Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND"
* commit '1c380c13d9bd60eefb515ea2c0a33f900a81f970':
  Remove the unnecessary indirection of TARGET_STRIP_COMMAND
2014-03-31 17:34:29 +00:00
Ying Wang 1c380c13d9 Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND" 2014-03-31 17:30:06 +00:00
Narayan Kamath 9fbd3afdec am 431b4bb3: Merge "Extend the CPU ABI specification mechanism."
* commit '431b4bb354699704e5e601483095efed93bd908c':
  Extend the CPU ABI specification mechanism.
2014-03-31 12:15:37 +00:00
Narayan Kamath 431b4bb354 Merge "Extend the CPU ABI specification mechanism." 2014-03-31 12:09:51 +00:00
Narayan Kamath 39fd21a2df Add a default value for ro.zygote.
Also makes sure the correct init config file is
copied across.

Change-Id: I281d00dab17f780bda21bf3fbc35418df18dffb1
2014-03-31 12:33:45 +01:00
Ying Wang ce1c596e15 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
2014-03-28 17:25:34 -07:00
Mathieu Chartier baa8a1b347 am 1da02a1a: Merge "Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000"
* commit '1da02a1ae15afc7b600f9585cc4ae52c5d262192':
  Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000
2014-03-28 19:22:14 +00:00
Mathieu Chartier 1da02a1ae1 Merge "Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000" 2014-03-28 19:19:13 +00:00
Narayan Kamath 1a43b375b4 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
2014-03-28 17:10:47 +00:00
Ying Wang da3eec42e1 am 708242d5: Merge "Increase the maximum javac heap size."
* commit '708242d599cad926dc37637b04e0a71711271a17':
  Increase the maximum javac heap size.
2014-03-27 19:01:45 +00:00
Ying Wang 708242d599 Merge "Increase the maximum javac heap size." 2014-03-27 18:57:17 +00:00
Ying Wang 01f11b2aa9 Increase the maximum javac heap size.
Java 7 needs more memory when you run some annotation tools.

Change-Id: Ia8b423244b9ce164500b24867fe2b3d10a5089ff
2014-03-26 19:23:46 -07:00
Colin Cross f3e25fea3a am 007faa43: Merge "add support for LOCAL_MULTILIB"
* commit '007faa43cf380013e2510363b707e46884f1466c':
  add support for LOCAL_MULTILIB
2014-03-26 23:58:56 +00:00
Colin Cross 007faa43cf Merge "add support for LOCAL_MULTILIB" 2014-03-26 22:03:48 +00:00
Colin Cross e6e48f67d8 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
2014-03-26 13:12:59 -07:00
Colin Cross ce08741397 am 36a67a90: Merge topic \'tests\'
* commit '36a67a9040f35fc47c0ea5cafa61910a7e2fcc66':
  add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64
  add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
2014-03-25 16:39:30 -07:00
Colin Cross 36a67a9040 Merge topic 'tests'
* changes:
  add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64
  add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
2014-03-25 23:35:32 +00:00
Colin Cross 5a9db90e40 add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64
Some executables will need to be built for both 32-bit and 64-bit.
For linker/linker64, debuggerd/debuggerd64, and a few more, they
will be installed in the same path (/system/bin), but with different
filenames.  Allow the module to specify LOCAL_MODULE_STEM_32 and
LOCAL_MODULE_STEM_64 to name the two versions.

Change-Id: I573e8678c7332245a064f31246be0a05f0a9e25f
2014-03-25 13:49:58 -07:00
Colin Cross 87974056d9 add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
Some executables will need to be built for both 32-bit and 64-bit.
For tests, it will be convienient to keep the name of the executable
the same, but install them in a different location.  Add
LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 to allow a module
to specify different paths for 32-bit and 64-bit executables.

Change-Id: I3be830e899c6d485fe55c25c66b20b3fe64c795e
2014-03-25 13:48:40 -07:00