Commit graph

4025 commits

Author SHA1 Message Date
Narayan Kamath
bfc9b30d36 am 81fc969b: am cf352c5d: Merge "Add warning message for java6 builds."
* commit '81fc969b65fb4cc7dc9f5698aa8c37c657f853ef':
  Add warning message for java6 builds.
2014-04-02 12:26:38 +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
839d2829bc am 35200762: am e28df19e: Merge "Call "java[c] -version" only once"
* commit '35200762980aa2c0f90e73e38af94fd29b50f91f':
  Call "java[c] -version" only once
2014-04-02 10:57:13 +00:00
Narayan Kamath
823f0ba6b8 am 0239220a: am 2f5de9f5: Merge "Bring main.mk in sync with master."
* commit '0239220a67f168fa30703e07750d1f4907dc99bf':
  Bring main.mk in sync with master.
2014-04-02 10:57:13 +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
7e28c07427 am 4ca6e2e5: am 38c0ac73: Merge "Use debug versions of dex2oat explicitly."
* commit '4ca6e2e52832d894b6387120e8b1c447121b5135':
  Use debug versions of dex2oat explicitly.
2014-04-02 09:02:12 +00:00
Nicolas Geoffray
38c0ac7386 Merge "Use debug versions of dex2oat explicitly." 2014-04-02 08:45:56 +00:00
Dmitriy Ivanov
7e739e549b am 83695037: am e44e8b0f: Merge "Remove redundant my_target_global_ldflags"
* commit '836950372ba00a8e65158e84ce9f35edd25c48ec':
  Remove redundant my_target_global_ldflags
2014-04-01 23:59:48 +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
7ebce18ac0 am 0cad8ee2: am 572e9acc: Merge "Always use prebuilt clang, even if we\'re explicitly building clang/LLVM."
* commit '0cad8ee2226d3af8dab854f26da405b15b3655ce':
  Always use prebuilt clang, even if we're explicitly building clang/LLVM.
2014-04-01 23:32:25 +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
31061ccfda am 5e5d26b1: am 47e60739: Merge "cortex-a7 supports div"
* commit '5e5d26b1efc6cb73e80e09598ab606678524ff21':
  cortex-a7 supports div
2014-04-01 18:27:32 +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
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
ff78e65231 am 9cfefe13: am 6a9f2b12: Merge "Add intel to the vendor whitelist"
* commit '9cfefe13aeb3295605ea47040767261df95d2cda':
  Add intel to the vendor whitelist
2014-04-01 03:05:06 +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
f966bda49f am 4714d3d7: am b34af41e: Merge "Fix java version detection when _JAVA_OPTIONS is set."
* commit '4714d3d7a604391d174049a7a595e80ebab2da18':
  Fix java version detection when _JAVA_OPTIONS is set.
2014-04-01 00:15:50 +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
fc1a735ec6 am 2d0ecc1b: am 0c4870a4: Merge "Specify -mcpu=cortex-a15 for denver CPU variants."
* commit '2d0ecc1b0071fbdc62f8d1f26bd510cd24ff47c2':
  Specify -mcpu=cortex-a15 for denver CPU variants.
2014-03-31 19:17:31 +00:00
Christopher Ferris
0c4870a4cd Merge "Specify -mcpu=cortex-a15 for denver CPU variants." 2014-03-31 19:06:28 +00:00
Ying Wang
1758fe1f87 am 30dbfa43: am 1c380c13: Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND"
* commit '30dbfa43eff071438376b5699dbe3391d08204da':
  Remove the unnecessary indirection of TARGET_STRIP_COMMAND
2014-03-31 17:37:47 +00:00
Ying Wang
1c380c13d9 Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND" 2014-03-31 17:30:06 +00:00
Narayan Kamath
f6811abe12 am 9fbd3afd: am 431b4bb3: Merge "Extend the CPU ABI specification mechanism."
* commit '9fbd3afdecc2fee211c11a6aedb39422fa8dd773':
  Extend the CPU ABI specification mechanism.
2014-03-31 12:21:55 +00:00
Narayan Kamath
431b4bb354 Merge "Extend the CPU ABI specification mechanism." 2014-03-31 12:09:51 +00: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
7803fde374 am baa8a1b3: am 1da02a1a: Merge "Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000"
* commit 'baa8a1b3476e3c6de6df7282b8c5b7d67aaec6de':
  Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000
2014-03-28 20:27:33 +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
9efc18fb99 am da3eec42: am 708242d5: Merge "Increase the maximum javac heap size."
* commit 'da3eec42e11d9ebe1e08fc7e64c7edaf59c28272':
  Increase the maximum javac heap size.
2014-03-27 19:08:02 +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
441e945248 resolved conflicts for merge of f3e25fea to klp-modular-dev-plus-aosp
Change-Id: I7b002780d8282b54821e8761198bc0af3e7ce71e
2014-03-26 17:06:33 -07: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
Xavier Ducrohet
c8fea2ae98 am 7c629a72: am cc851243: Merge "Add annotation support lib." into klp-ub-dev
* commit '7c629a728f628278986498060e649727cf5025fa':
  Add annotation support lib.
2014-03-26 18:17:08 +00:00
Xavier Ducrohet
7c629a728f am cc851243: Merge "Add annotation support lib." into klp-ub-dev
* commit 'cc85124393c438986e6639bc90906edf2dc2ca7a':
  Add annotation support lib.
2014-03-26 18:10:46 +00:00
Xavier Ducrohet
cc85124393 Merge "Add annotation support lib." into klp-ub-dev 2014-03-26 18:06:40 +00:00
Xavier Ducrohet
ef04682fdf Add annotation support lib.
Change-Id: I5a4ddbdf09a09db944e16ed6baab604aa1710974
2014-03-26 10:50:38 -07:00
Colin Cross
8295d6cd62 am ce087413: am 36a67a90: Merge topic \'tests\'
* commit 'ce08741397e0468185457f5c7e8aee08272e6752':
  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:44:58 +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
Tim Murray
6440fb0c84 am b35094ec: am 01aa01db: Merge "Make Clang host builds hermetic on Linux."
* commit 'b35094ec709c8de7f3f7d6dbd54655ec99cd9529':
  Make Clang host builds hermetic on Linux.
2014-03-25 19:09:35 +00:00
Colin Cross
3a943c9e57 am 0143ee4a: am a3c76c28: Merge "remove libeffects from 64-bit blacklist"
* commit '0143ee4a5779620659c7b59e4294359c4a96af78':
  remove libeffects from 64-bit blacklist
2014-03-25 19:09:33 +00:00
Tim Murray
01aa01dbfa Merge "Make Clang host builds hermetic on Linux." 2014-03-25 18:33:29 +00:00
Colin Cross
a3c76c2824 Merge "remove libeffects from 64-bit blacklist" 2014-03-25 17:54:56 +00:00
Ying Wang
711951abf0 am 78a819d6: am 266cf4f2: am f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS
* commit '78a819d600ab750227009fd3dc93f7f2886600c7':
  Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
2014-03-25 10:04:39 +00:00
Ying Wang
78a819d600 am 266cf4f2: am f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS
* commit '266cf4f2595323170fe02db05835884b4522a0f9':
  Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
2014-03-25 09:56:52 +00:00
Andrew Hsieh
0adc643104 am c550cd45: am fa97fe67: Merge "Pick gnu-libstdc++ based on TARGET_GCC_VERSION"
* commit 'c550cd45536c7153726c502886bf32797e997dd3':
  Pick gnu-libstdc++ based on TARGET_GCC_VERSION
2014-03-25 02:54:46 +00:00
Tim Murray
02cefc93a8 Make Clang host builds hermetic on Linux.
This lays the groundwork for making builds hermetic on Darwin as well.
That will be fixed in a future patch.

bug 13435344

Change-Id: Iae82d0b9efad0598d682ff5fd4daa737aa607866
2014-03-24 19:38:47 -07:00