p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
20,516 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

5945 Commits

Author SHA1 Message Date
Jeff Davidson 427d1e98ec Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE." 2014-10-29 17:35:17 +00:00
Ian Rogers 508e27bfd7 am 93cb8c7d: Merge "Specify -mcpu=krait for clang." 
* commit '93cb8c7d951b89eeb1e3cee2433bffecc13fdb11':
  Specify -mcpu=krait for clang.
 2014-10-29 12:32:37 +00:00
Ian Rogers e270873407 Specify -mcpu=krait for clang. 
Change-Id: I64682cddf57246341c1727ca16c56f7ce0c6fd0a
 2014-10-28 15:50:02 -07:00
Andrew Boie 388c04dd6b definitions.mk: look for definitions.mk in device/*/build also 
build/core/Makefile looks for build tasks in either device/*/build/tasks
or vendor/*/build/tasks. Do the same with vendor-specific definitions.mk.

Change-Id: Ib4fd00a1d0effe8e347382a922da101ce26bf696
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
 2014-10-28 08:36:00 -07:00
Neil Fuller acd65c7db0 am 97ef1d46: Merge "Add OpenJDK 8 experimental support" 
* commit '97ef1d46cdae3776e49900b2ed92748f6127bbb0':
  Add OpenJDK 8 experimental support
 2014-10-28 04:50:49 +00:00
Chih-Hung Hsieh 736a146c3c am 717ebfc1: Merge "Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS." 
* commit '717ebfc13182202ab38e17c0cd008924e9e5c4e9':
  Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS.
 2014-10-28 04:48:54 +00:00
Dan Albert ef8912d93f am d274e04a: Merge "Don\'t sort shared library link order." 
* commit 'd274e04ac4317d7cfc2de02ca215e064c018c234':
  Don't sort shared library link order.
 2014-10-28 04:46:53 +00:00
Chih-Hung Hsieh 6555580d35 am ea503d21: Merge "Raise x86 arch requirement to prescott." 
* commit 'ea503d21c7d5ecb3deacbf50f3ec7366bf7bd573':
  Raise x86 arch requirement to prescott.
 2014-10-28 04:46:49 +00:00
Marcos Marado a69822cb2b Force colorsheme to SVG, since darkblue doesn't exist on X11 
Change-Id: I1b9e13dd4ca63ba27a49a55d95130bdceb187669
 2014-10-27 17:41:01 +00:00
Neil Fuller f7ce9508de am 4dfda1fa: Merge "Remove Java 6 build support" 
* commit '4dfda1fa4201e41022396b77054168ffc73b590c':
  Remove Java 6 build support
 2014-10-24 20:18:15 +00:00
Chih-Hung Hsieh 54fd82d111 am 660f3c9a: Merge "Set default to Clang integrated assembler." 
* commit '660f3c9ae9cb99f428fb62fb6a1256679eb9f138':
  Set default to Clang integrated assembler.
 2014-10-24 13:02:00 +00:00
Neil Fuller 97ef1d46cd Merge "Add OpenJDK 8 experimental support" 2014-10-24 08:16:04 +00:00
Chih-Hung Hsieh 22b6c5c2c1 Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS. 
BUG: 18108271
Change-Id: Id929cad31340d2946027603c1c8c8fb1cb60f66a
 2014-10-23 16:39:09 -07:00
Dan Albert d274e04ac4 Merge "Don't sort shared library link order." 2014-10-23 22:20:01 +00:00
Dan Albert 04eead7e2b Don't sort shared library link order. 
Only sort the list of shared libraries used for naming dependencies,
not the order they are actually linked in. The order in which shared
libraries appear to the linker affects which symbols get used if there
is a multiply defined symbol.

Also link system shared libraries _after_ user provided libraries,
since a user will want their functions to override the system's if
they exist.

Change-Id: I071059d940d40a648d69d90e0699073ef520138a
 2014-10-23 14:04:02 -07:00
Chih-Hung Hsieh ea503d21c7 Merge "Raise x86 arch requirement to prescott." 2014-10-23 20:47:30 +00:00
Jeff Davidson b8ddd55b55 Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE. 
If a module is explicitly depending on a versioned protolib, we strip
the dependency and log a warning so the unneeded dependency can be
removed.

Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
 2014-10-23 07:20:16 -07:00
Neil Fuller 960f22c11d Add OpenJDK 8 experimental support 
Targeting 1.7: just adding support for the tools.

Various issues exist with OpenJDK 8: it doesn't build to completion
yet.

Change-Id: I54942f497264234e4bef488c8d17d243b4ef2f14
 2014-10-23 14:07:29 +01:00
Neil Fuller 4dfda1fa42 Merge "Remove Java 6 build support" 2014-10-23 09:00:15 +00:00
Bill Yi 4ac049b7ec Restore AOSP-style version numbers - DO NOT MERGE 2014-10-22 15:44:51 -07:00
Chih-Hung Hsieh c248fa3e01 Raise x86 arch requirement to prescott. 
Atomic functions used in external/libcxx/include/atomic when compiled with Clang
will require intrinsic functions exist only for prescott or newer CPUs.

BUG: 17530542
Change-Id: I0c9660ed2ffa75b940981eb8165d88934b39aec5
 2014-10-22 15:25:49 -07:00
Chih-Hung Hsieh 57c8a15edd Set default to Clang integrated assembler. 
BUG: 17820427
Change-Id: I10a6ddd94aad083665164d7939990e148b3b6efb
 2014-10-22 09:21:53 -07:00
Bill Yi 13466f0f79 Merge commit '66b3e31936b99436e01c473dca492126eea3e336' into HEAD 2014-10-22 08:45:57 -07:00
Ying Wang c6a12d776a am 46ba24c4: Merge "Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it." 
* commit '46ba24c4a00156d6149be78928de962bf52e9502':
  Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
 2014-10-22 13:12:13 +00:00
Neil Fuller 46e00ea4ba Remove Java 6 build support 
Change-Id: I9754844af58e3f81d7eb9dae286128d17a2cb56c
 2014-10-22 10:53:59 +01:00
Ying Wang 85f24a406b Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it. 
Change-Id: I9182ce1efe09609100d19c9fae2bc4fe7358dfc0
 2014-10-21 18:36:43 -07:00
Ying Wang f3e4b2c98e am 18cd0225: Merge "Add -Wno-unused-command-line-argument to clang cflags to enable ccache." 
* commit '18cd02257d7045543ba435aa1efa497c8a780f27':
  Add -Wno-unused-command-line-argument to clang cflags to enable ccache.
 2014-10-21 20:20:56 +00:00
Ying Wang 18cd02257d Merge "Add -Wno-unused-command-line-argument to clang cflags to enable ccache." 2014-10-21 19:19:16 +00:00
Ying Wang 24e03369cf Add -Wno-unused-command-line-argument to clang cflags to enable ccache. 
Previously ccache is disabled when it fails calling clang's preprocessor with
unused arguments (such as '-Wa,--noexecstack') in the command line.

See http://petereisentraut.blogspot.com/2011/05/ccache-and-clang.html.
(-Qunused-arguments suppresses more than
-Wno-unused-command-line-argument does.)

Change-Id: I6cde307632c8395c053eb28063d7844d93070562
 2014-10-20 17:21:16 -07:00
Adam Lesinski 66b3e31936 am 318217a8: Enable building of gtest for Windows 
* commit '318217a84a05880f5e10ba2086f87eb0320772c7':
  Enable building of gtest for Windows
 2014-10-21 00:01:15 +00:00
Adam Lesinski 318217a84a Enable building of gtest for Windows 
Windows does not have pthread support, and by defining the
GTEST_OS_WINDOWS flag, pthread support will not be built into
the windows version of gtest.

Change-Id: I0571fc52e77bb04175470d5750a7e2f46cdd5e86
 2014-10-20 16:06:44 -07:00
Dan Albert 96983cba42 am cc0aa4da: am 28c265dd: Merge "We also need -rdynamic for host ASAN." 
* commit 'cc0aa4dabd4bae2b17bc9de8f88e04e862d030b2':
  We also need -rdynamic for host ASAN.
 2014-10-20 22:42:11 +00:00
Dan Albert cc0aa4dabd am 28c265dd: Merge "We also need -rdynamic for host ASAN." 
* commit '28c265ddddebeabc0597e976fbc817b70c46abc2':
  We also need -rdynamic for host ASAN.
 2014-10-20 22:36:45 +00:00
Dan Albert 4ffe3f5b9f We also need -rdynamic for host ASAN. 
Change-Id: Iee33ca85c25d9bf126be8318a3b837074ab10076
 2014-10-20 13:54:27 -07:00
Dan Albert 66acb2a8ae resolved conflicts for merge of 96c22133 to lmp-dev-plus-aosp 
Change-Id: I35a2f403e9e664536b45b5ac9185adf1e1a02442
 2014-10-20 13:37:18 -07:00
Dan Albert 96c22133af am 1f134dd0: Merge "Add support for ASAN in host modules." 
* commit '1f134dd06cd12f032c833b9a43b476a9557fa8da':
  Add support for ASAN in host modules.
 2014-10-20 20:28:43 +00:00
Dan Albert 1f134dd06c Merge "Add support for ASAN in host modules." 2014-10-20 20:24:08 +00:00
Dan Albert 2daceaa83c Add support for ASAN in host modules. 
Change-Id: Id9ed83499e0eb995f06e845c3153a50677d768b8
 2014-10-20 11:37:18 -07:00
Stephen Hines 554e514c21 am 7d86749d: am ed8206db: Merge "Remove unnecessary 10.8-specific build rules" 
* commit '7d86749da7033dcf230ceb67f9ae0cd676441e4d':
  Remove unnecessary 10.8-specific build rules
 2014-10-20 18:30:08 +00:00
Stephen Hines 7d86749da7 am ed8206db: Merge "Remove unnecessary 10.8-specific build rules" 
* commit 'ed8206dba48e182f786ec677d56586ffaf973250':
  Remove unnecessary 10.8-specific build rules
 2014-10-20 18:19:25 +00:00
Stephen Hines ed8206dba4 Merge "Remove unnecessary 10.8-specific build rules" 2014-10-20 18:06:35 +00:00
Dan Albert 82f820e416 am ec28a489: am 28c2d3b9: Merge "Fix breakage for x86_64 static executables." 
* commit 'ec28a489e8d4fe7ddc35bee1f16e08bebd202dac':
  Fix breakage for x86_64 static executables.
 2014-10-18 02:42:07 +00:00
Dan Albert ec28a489e8 am 28c2d3b9: Merge "Fix breakage for x86_64 static executables." 
* commit '28c2d3b9852550bc9ae150e2725e08885f1ade73':
  Fix breakage for x86_64 static executables.
 2014-10-18 02:25:40 +00:00
Dan Albert 28c2d3b985 Merge "Fix breakage for x86_64 static executables." 2014-10-18 01:05:36 +00:00
Stephen Hines 781094fa43 Remove unnecessary 10.8-specific build rules 
We no longer need gcc for host builds, since those all run through clang. This
header include, however, triggers errors about SSE intrinsics by replacing
the more relevant include dirs that we should be using.

Change-Id: I26a949f0109de8e6e2d1f09cb8127be927549cc4
 2014-10-17 17:36:42 -07:00
Dan Albert 403ab71eba Fix breakage for x86_64 static executables. 
Yikes. Don't know how this slipped through code review.

I had actually mentioned a need for cleanup in this part of the build
system earlier, since the amount of duplication between
transform-o-to-* for each arch means we might fix things incorrectly
in one of them (as I've just shown). Similarly, code reviewers are
likely to skim each one after the first if they all look close enough
(which is presumably what happened here).

Change-Id: I9b85914510f0b114485021deb97f42740712aae5
 2014-10-17 16:58:38 -07:00
Dan Albert 4eb496cc8d am fb77fe99: am 26707ca8: Merge "Use libstc++ for the name of bionic\'s STL." 
* commit 'fb77fe99b7a6ef0ce016f187d79ac5d9c75742ba':
  Use libstc++ for the name of bionic's STL.
 2014-10-17 17:53:07 +00:00
Dan Albert fb77fe99b7 am 26707ca8: Merge "Use libstc++ for the name of bionic\'s STL." 
* commit '26707ca8bb29b62252dd9d3d346f731f4fad2806':
  Use libstc++ for the name of bionic's STL.
 2014-10-17 17:48:24 +00:00
Dan Albert 26707ca8bb Merge "Use libstc++ for the name of bionic's STL." 2014-10-17 17:44:36 +00:00
Ian Rogers ed2783b8c6 am 0251f345: am fc82be6e: Merge "Add LPAE to dex2oat ISA feature list." 
* commit '0251f3454e5f4716716673f2df1becd0730fbc79':
  Add LPAE to dex2oat ISA feature list.
 2014-10-17 07:44:14 +00:00
Ian Rogers 0251f3454e am fc82be6e: Merge "Add LPAE to dex2oat ISA feature list." 
* commit 'fc82be6e776acfc3d784e61e2026d65417285495':
  Add LPAE to dex2oat ISA feature list.
 2014-10-17 07:34:45 +00:00
Dan Albert 93e8cf71fc Use libstc++ for the name of bionic's STL. 
It is libstdc++.so, after all, and the naming makes sense for the host
this way (since it also uses libstdc++).

Change-Id: If37ffa015f7967a928ea47a290363d7696c4ce35
 2014-10-16 21:18:15 -07:00
Ian Rogers fc82be6e77 Merge "Add LPAE to dex2oat ISA feature list." 2014-10-17 03:56:42 +00:00
Ying Wang 19f43c18f6 am b3f42ed0: am 4e3e9ffb: Merge "Fix Java detection on some Linux distributions" 
* commit 'b3f42ed09a141b23c0738a828788b3d77d610b4b':
  Fix Java detection on some Linux distributions
 2014-10-16 21:09:06 +00:00
Ying Wang b3f42ed09a am 4e3e9ffb: Merge "Fix Java detection on some Linux distributions" 
* commit '4e3e9ffbf314500d303724aefbddf1b89094cfd8':
  Fix Java detection on some Linux distributions
 2014-10-16 21:03:04 +00:00
Ying Wang 4e3e9ffbf3 Merge "Fix Java detection on some Linux distributions" 2014-10-16 20:58:37 +00:00
Ian Rogers 1bd593ca0b am defe864a: am 07b212ac: Merge "Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level." 
* commit 'defe864ab6f971efc00328cee5ea3cb1d69d377d':
  Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level.
 2014-10-16 20:13:05 +00:00
Ian Rogers defe864ab6 am 07b212ac: Merge "Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level." 
* commit '07b212ac59f0018a01ad3262caa0b96b9aff30a1':
  Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level.
 2014-10-16 20:07:27 +00:00
Ian Rogers 6825e3c9db Add LPAE to dex2oat ISA feature list. 
Bug: 17993736

Change-Id: Ibdf0df017a582d7d807dff17f0392dbf28475e02
 2014-10-16 13:07:05 -07:00
Ian Rogers 07b212ac59 Merge "Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level." 2014-10-16 20:02:26 +00:00
Dan Albert ad1891d1e9 am 8a47f6d3: am f2bdac77: Merge "Never use stlport on the host." 
* commit '8a47f6d3192140646d0d057c371b17e487fc2a77':
  Never use stlport on the host.
 2014-10-16 18:10:15 +00:00
Dan Albert 8a47f6d319 am f2bdac77: Merge "Never use stlport on the host." 
* commit 'f2bdac77b1d99abb190253f386cc6ffe4ffbeaca':
  Never use stlport on the host.
 2014-10-16 18:05:33 +00:00
Dan Albert b49987e2f8 Never use stlport on the host. 
LOCAL_CXX_STL := stlport should just use the default STL on the host.

Change-Id: Iede1b2d8884e237a10e000e5835addb768c8f78d
 2014-10-16 09:53:51 -07:00
Bernhard Rosenkraenzer 311384fec3 Fix Java detection on some Linux distributions 
On some Linux distributions (spotted here on OpenMandriva Lx, but I'm
pretty sure some others do the same thing), "which javac" returns
/usr/bin/javac, which is a symlink to "../../etc/alternatives/javac",
which in turn points at whatever the JDK the user picked as his default.

Given "../../etc/alternatives/javac" is a relative symlink, the next
iteration of LSLINE=$(ls -l "$JAVAC") fails (no ../../etc/alternatives/java
relative to the build directory), causing tools.jar not to be found.

Using realpath and readlink where possible should work in all cases.

Change-Id: Ic60ac84a5b263dc1c1f2960092a7549d1024ed2e
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
 2014-10-16 14:08:32 +02:00
Ian Rogers 63e551f0ae Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level. 
LPAE indicates better instructions can be used when atomicity guarantees are
needed. However, LPAE's presence isn't advertised by clang/GCC. We fake an
ARM feature to advertise its presence on architectures where it is.
Also, add a TODO documenting that cortex-a15 is not the correct CPU variant
for krait.

Change-Id: I02a1248025c32d94eca0bc8a249dc524f1ac9c36
 2014-10-15 15:44:16 -07:00
Dan Albert b0d324aadd Merge "resolved conflicts for merge of 852fc3e6 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp 2014-10-15 00:19:06 +00:00
Stuart Scott 3e65583ef7 am f06c6eff: Add abi to generated XML 
* commit 'f06c6eff656f6bf0ac06662ef21e29e446e1a43d':
  Add abi to generated XML
 2014-10-15 00:18:37 +00:00
Dan Albert ae66eba6f3 resolved conflicts for merge of 852fc3e6 to lmp-dev-plus-aosp 
Change-Id: If3de742dcd2157c4690ae0eb34494dc11492054f
 2014-10-14 17:15:17 -07:00
Stuart Scott f06c6eff65 Add abi to generated XML 
bug:17881028
Change-Id: I6dd37e99c0f511d8c883cb8128ea743c2e21f6ad
 2014-10-15 00:10:08 +00:00
Dan Albert 852fc3e69c am c131ec09: Merge "Link compiler-rt in the correct order." 
* commit 'c131ec09d9ffb92473c4162c92c0646d6e731b0c':
  Link compiler-rt in the correct order.
 2014-10-15 00:05:35 +00:00
Dan Albert e1b17e7ef5 Link compiler-rt in the correct order. 
The compiler run-time library should always be the _last_ thing linked
when building static executables. This was being done correctly for
libgcc, but not when using compiler-rt.

Change-Id: I0689dc35f55caad2fe74c0cbb4cbe3008ded349a
 2014-10-14 10:45:33 -07:00
Elliott Hughes 337dd2e637 am 33f33371: am 165fdf42: Merge "Remove "-mstackrealign" option from all x86 builds." 
* commit '33f33371cdef7d8faa9f39cd4902698856c0bb64':
  Remove "-mstackrealign" option from all x86 builds.
 2014-10-13 22:45:42 +00:00
Elliott Hughes 33f33371cd am 165fdf42: Merge "Remove "-mstackrealign" option from all x86 builds." 
* commit '165fdf42042d7c13d9f7866b3a3eff841e08dad2':
  Remove "-mstackrealign" option from all x86 builds.
 2014-10-13 22:41:47 +00:00
Elliott Hughes 165fdf4204 Merge "Remove "-mstackrealign" option from all x86 builds." 2014-10-13 22:35:59 +00:00
Alexander Ivchenko ae2d47a47f Remove "-mstackrealign" option from all x86 builds. 
For ndk docs change, please refer to:
https://android-review.googlesource.com/#/c/110100/

Change-Id: I8428e7a979eb02441066aeeee43ce693d4d0dc8d
Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>
 2014-10-13 19:08:01 +04:00
Raphael Moll 8d28a2c044 am a4d1f6a7: SDK Addon multi-sys-img support. 
* commit 'a4d1f6a7f0399b5e5e38b7c6f274f5fb11be48b9':
  SDK Addon multi-sys-img support.
 2014-10-10 14:34:31 +00:00
Ying Wang 8755756f26 resolved conflicts for merge of 3907c03e to lmp-dev-plus-aosp 
Change-Id: I580ab0693609ff506da7346548a45322000114d1
 2014-10-09 19:29:53 -07:00
Ying Wang 3907c03e24 am f1794738: Merge "Introduce per-product per-module dex-preopt config" 
* commit 'f1794738b178c22bd7f05348f2a393cdec23ade4':
  Introduce per-product per-module dex-preopt config
 2014-10-10 02:19:10 +00:00
Ying Wang f1794738b1 Merge "Introduce per-product per-module dex-preopt config" 2014-10-10 02:13:10 +00:00
Raphael Moll a4d1f6a7f0 SDK Addon multi-sys-img support. 
Fix an issue where the add-on system images have 2 extra
inner folders. The sole root folder in the zip file should
be the ABI one.

Change-Id: Ie12b913438e2b1113d34222e467ff280daa23c7f
 2014-10-10 00:50:39 +00:00
Chih-Hung Hsieh 25756c1422 am 8913e282: am 29373be8: Merge "Add -fPIC as default Clang mips ASFLAGS." 
* commit '8913e28295a9f93121fa60f74a6ff39eadd2e86d':
  Add -fPIC as default Clang mips ASFLAGS.
 2014-10-09 17:24:37 +00:00
Chih-Hung Hsieh 8913e28295 am 29373be8: Merge "Add -fPIC as default Clang mips ASFLAGS." 
* commit '29373be81de4d6e8817434b146c395b2a28e4628':
  Add -fPIC as default Clang mips ASFLAGS.
 2014-10-09 17:20:01 +00:00
Chih-Hung Hsieh 29373be81d Merge "Add -fPIC as default Clang mips ASFLAGS." 2014-10-09 17:17:08 +00:00
Ying Wang c206b0671f am edb9df24: Merge "Check to determine if we can run dex-preopt." into lmp-dev 
* commit 'edb9df24d00091a5206ba36d7f32ed75d6c462b9':
  Check $(built_dex) to determine if we can run dex-preopt.
 2014-10-09 12:34:03 +00:00
Dan Albert 6adf02580b am 24c1d149: am a01fa4f8: Merge "LOCAL_NATIVE_COVERAGE should imply -O0." 
* commit '24c1d149678dcd03f679bfa0fc29386cee779935':
  LOCAL_NATIVE_COVERAGE should imply -O0.
 2014-10-09 01:14:58 +00:00
Dan Albert 24c1d14967 am a01fa4f8: Merge "LOCAL_NATIVE_COVERAGE should imply -O0." 
* commit 'a01fa4f8a369580a888317d0ea7f3507f4dcc828':
  LOCAL_NATIVE_COVERAGE should imply -O0.
 2014-10-09 01:01:39 +00:00
Dan Albert 4c12c0303c LOCAL_NATIVE_COVERAGE should imply -O0. 
Optimization can lead to incorrect coverage results.

Change-Id: I8ade9ab246e292d26ac18821baf9970e29dc1a1f
 2014-10-08 17:05:19 -07:00
Chih-Hung Hsieh ce6300a5db Add -fPIC as default Clang mips ASFLAGS. 
For mips target, gcc passes -KPIC to assembler by default,
but clang passes -KPIC only if -fPIC or -fpic is given.

BUG: 17895505
Change-Id: I7803adaf8ad7b40c6473872b67f4e0b4c502b38a
 2014-10-08 15:41:29 -07:00
Ying Wang 62fb8a1f55 Check $(built_dex) to determine if we can run dex-preopt. 
Change-Id: Icfed37f50671ec041f2cfdcec9175cb094b572fc
 2014-10-08 15:23:24 -07:00
Ying Wang 20ebd2ef08 Introduce per-product per-module dex-preopt config 
- Added LOCAL_DEX_PREOPT_FLAGS to pass extra flags to dex2oat.
- Added macro add-product-dex-preopt-module-config to specify almost
  arbitrary dex-preopt config/flags to modules in product
  configuration:
  $(call \
  add-product-dex-preopt-module-config,<module_name_list>,<config_or_flags>)
  How <config_or_flags> is interpreted is decided by
  dex_preopt_odex_install.mk and dex2oat. For now if it's "disable" we
  disable dexpreopt for the given modules; otherwise pass it to dex2oat as
  command line flags.
- If there are multiple configs for the same module in the product
  inheritance, the first takes precedence.
- Added PRODUCT_DEX_PREOPT_DEFAULT_FLAGS so you can specify default
  dex2oat flags in product configuration.
- Added PRODUCT_DEX_PREOPT_BOOT_FLAGS to specify flags of building boot.oat.

Bug: 17791867
Change-Id: I1b2955e8e51039e94d1ff43a3265a8d03598632c
 2014-10-08 10:11:17 -07:00
Ying Wang cc9e30ef35 am 1a856098: Merge "Export build thumbprint only if the product has specified at least one oem fingerprint property" into lmp-dev 
* commit '1a856098ea819a75ad904ff6d6dcfac9545a02a6':
  Export build thumbprint only if the product has specified at least one oem fingerprint property
 2014-10-08 16:38:40 +00:00
Ying Wang e24e17a976 Export build thumbprint only if the product has specified at least one oem fingerprint property 
Bug: 17888863
Change-Id: I4d12bc977dcb5e8e1858efb2a395466d8779de34
 2014-10-07 18:59:47 -07:00
Ying Wang 4019305580 am e4e50f9b: am 8330c4c5: Merge "Apply LOCAL_CXX_STL to also prebuilts." 
* commit 'e4e50f9bb4ae8af11aaddf9825a09ff33241b204':
  Apply LOCAL_CXX_STL to also prebuilts.
 2014-10-07 23:20:51 +00:00
Ying Wang e4e50f9bb4 am 8330c4c5: Merge "Apply LOCAL_CXX_STL to also prebuilts." 
* commit '8330c4c5e6f8bb8b64e1b45ceed603b49853a086':
  Apply LOCAL_CXX_STL to also prebuilts.
 2014-10-07 21:15:38 +00:00
Ying Wang 75e8fcbb6c Apply LOCAL_CXX_STL to also prebuilts. 
Because LOCAL_CXX_STL modifies a module's required shared libaries,
we need this for also prebuilt shared libraries and executables.

Change-Id: I418c26143999a613c40aadf990f131b123e0ac3d
 2014-10-07 13:07:00 -07:00
Nicolas Geoffray 888bd7d4ab am cb2ee3ef: am 9bf56c5e: Merge "Fix typo." 
* commit 'cb2ee3ef637e47da63dcdb1d60c55709820789e7':
  Fix typo.
 2014-10-07 10:28:18 +00:00
Nicolas Geoffray cb2ee3ef63 am 9bf56c5e: Merge "Fix typo." 
* commit '9bf56c5e911856bc55693f5723a53271147e583e':
  Fix typo.
 2014-10-07 10:23:31 +00:00
Nicolas Geoffray 4c0c390f30 Fix typo. 
Change-Id: I738ad878a2961d118b5a89bf7d434606df2fad92
 2014-10-07 11:17:09 +01:00
Nicolas Geoffray f3efdfc830 am a6b9e887: am 4af753c1: Merge "Make which dex2oat version to use configurable." 
* commit 'a6b9e887b98152f913f4e6d9f864da00bc1cc21e':
  Make which dex2oat version to use configurable.
 2014-10-07 09:44:07 +00:00
Nicolas Geoffray a6b9e887b9 am 4af753c1: Merge "Make which dex2oat version to use configurable." 
* commit '4af753c1d1e770419314108ad795b97d17b11380':
  Make which dex2oat version to use configurable.
 2014-10-07 09:41:46 +00:00
Nicolas Geoffray 4af753c1d1 Merge "Make which dex2oat version to use configurable." 2014-10-07 09:38:18 +00:00
Nicolas Geoffray 75c08b2118 Make which dex2oat version to use configurable. 
Change-Id: Ic13cf6f9dfb117193a5101781945c501d138955c
 2014-10-07 08:30:18 +00:00
Dan Albert cb6992b4b4 am a3b31d7b: am 642c81ea: Merge "Stash original values of CC and CXX." 
* commit 'a3b31d7b83254a644efd12de3de835594124ef65':
  Stash original values of CC and CXX.
 2014-10-06 18:46:03 +00:00
Dan Albert 15cb27748f am 55c2adff: am b6361968: Merge "Remove unused my_compiler_dependencies." 
* commit '55c2adfffac9b40992316938699cb36e0818fbbb':
  Remove unused my_compiler_dependencies.
 2014-10-06 18:46:02 +00:00
Dan Albert a3b31d7b83 am 642c81ea: Merge "Stash original values of CC and CXX." 
* commit '642c81ea4559836236a38123feec3d8e51d4b9c2':
  Stash original values of CC and CXX.
 2014-10-06 18:36:43 +00:00
Dan Albert 55c2adfffa am b6361968: Merge "Remove unused my_compiler_dependencies." 
* commit 'b6361968f86a1e96e1cdf5451d62ea35541de1e3':
  Remove unused my_compiler_dependencies.
 2014-10-06 18:36:42 +00:00
Dan Albert 642c81ea45 Merge "Stash original values of CC and CXX." 2014-10-06 18:33:59 +00:00
Dan Albert a8fd66822a Remove unused my_compiler_dependencies. 
my_compiler_dependencies was never assigned to, but the way it was
included in the rules prevented the user from being able to use | in
LOCAL_ADDITIONAL_DEPENDENCIES. Since it is unneeded, just remove it.

Change-Id: I74bb59e81b97756296060eea5b7a42909be50130
 2014-10-06 10:45:44 -07:00
Dan Albert ec1b90f81f Stash original values of CC and CXX. 
This way we can still access the real compiler as opposed to a wrapped
one.

Change-Id: I17ba30416a3eb8eda056c67faaa8b5957e70caea
 2014-10-06 10:43:29 -07:00
Andreas Gampe 783e667b2a am c776f063: Merge "Build: Do not set interpreted mode for SDK build" into lmp-dev 
* commit 'c776f06379929f1e1b9d1f4bb0749faf36e19670':
  Build: Do not set interpreted mode for SDK build
 2014-10-03 22:25:17 +00:00
Andreas Gampe c776f06379 Merge "Build: Do not set interpreted mode for SDK build" into lmp-dev 2014-10-03 22:20:54 +00:00
Andreas Gampe 2abc44c2fe Build: Do not set interpreted mode for SDK build 
In case of emulator images created for an sdk build (sdk, win_sdk,
sdk_addon), do not set dex2oat to compile apps interpret-only.

Bug: 17796919

Change-Id: I6961aa20fd3b6ea164a1f55321387e84c8983550
 2014-10-03 13:46:24 -07:00
Ying Wang 05cd0da9b8 am a45c2e58: Merge "Add two useful character constants." into lmp-dev 
* commit 'a45c2e5834ae6ff983e158c79f4fd65e09cdb766':
  Add two useful character constants.
 2014-10-03 19:21:37 +00:00
Ying Wang a45c2e5834 Merge "Add two useful character constants." into lmp-dev 2014-10-03 18:47:16 +00:00
Ying Wang 58a5db35a6 Add two useful character constants. 
You need those constant variables when you want to insert newline or
backslash at the end of a macro.

Change-Id: I3fe96580d7a4ebc9d013afe6dd4ec8f40f49c724
 2014-10-03 11:36:27 -07:00
Ying Wang 233fd39afa am 4991ae0b: Merge "Add split apks to the cts package." into lmp-dev 
* commit '4991ae0b461688a5ecfe43707b9034e4e56809e4':
  Add split apks to the cts package.
 2014-10-03 17:19:04 +00:00
Ying Wang 4991ae0b46 Merge "Add split apks to the cts package." into lmp-dev 2014-10-03 17:15:35 +00:00
Andreas Gampe 32ff269936 am 5e0dbe0c: Conditionally skip dex-preopting prebuilts. 
* commit '5e0dbe0c3769031b4785ef54a89554cd5c75cba7':
  Conditionally skip dex-preopting prebuilts.
 2014-10-02 21:15:01 +00:00
Andreas Gampe 5e0dbe0c37 Conditionally skip dex-preopting prebuilts. 
To skip dex-preopting prebuilts (to save system image space),
set "DONT_DEXPREOPT_PREBUILTS := true".

Bug: 17772057

Change-Id: I13f10e2a9c251366f29606158f8c2fb54f8ee8b1
 2014-10-02 10:14:59 -07:00
Stephen Hines 0d07cfeaf8 am a503fb36: PIE executables created with mingw use "mainCRTStartup" as their entry point. 
* commit 'a503fb362918363b28637b487eba83e9ad647ceb':
  PIE executables created with mingw use "mainCRTStartup" as their entry point.
 2014-10-02 15:23:41 +00:00
Stephen Hines a503fb3629 PIE executables created with mingw use "mainCRTStartup" as their entry point. 
Bug: 14416410

Our linker uses "start" as the primary entry point, so we need to adjust this
for mingw-based Windows compiles, or nothing will execute correctly.

Change-Id: I6e99f43e075ef9f00500099ce34ec4425c996454
 2014-10-02 00:57:09 -07:00
Ying Wang faf374a095 am 72f0cf56: Merge "Convert comma in split arguments to underscore." into lmp-dev 
* commit '72f0cf56b362b8a4b6cfefb3f47240aa9e2d5ce6':
  Convert comma in split arguments to underscore.
 2014-10-02 01:08:07 +00:00
Ying Wang 72f0cf56b3 Merge "Convert comma in split arguments to underscore." into lmp-dev 2014-10-02 01:00:04 +00:00
Tim Murray 1de169124d Merge "Update prebuilt RS clcore location." into lmp-dev 2014-10-01 23:31:50 +00:00
Stephen Hines f075ad906d am 07a11d31: Merge "Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler." into lmp-dev 
* commit '07a11d31f0baa355f9c3da60f965a56ff1d125e5':
  Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler.
 2014-10-01 23:01:30 +00:00
Stephen Hines 532376db67 am 56f688bc: Merge "Switch TBLGEN-related executables to use "BUILD_" instead of "HOST_"." into lmp-dev 
* commit '56f688bce5f3229f065a94446d049bc3a055b92b':
  Switch TBLGEN-related executables to use "BUILD_" instead of "HOST_".
 2014-10-01 23:01:29 +00:00
Stephen Hines 07a11d31f0 Merge "Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler." into lmp-dev 2014-10-01 22:54:10 +00:00
Stephen Hines 56f688bce5 Merge "Switch TBLGEN-related executables to use "BUILD_" instead of "HOST_"." into lmp-dev 2014-10-01 22:53:38 +00:00
Tim Murray dc1d0abe37 Update prebuilt RS clcore location. 
Change-Id: Iebf255d7cc093b74e08b1f1378d9b397fd9dd3b9
 2014-10-01 15:52:11 -07:00
Dan Albert 3a4ae05422 am 3594f5f0: am 9979ae43: Merge "Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h." 
* commit '3594f5f0ed04853f2171a7f0f719a1e25dba3b6d':
  Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h.
 2014-10-01 20:50:08 +00:00
Dan Albert 3594f5f0ed am 9979ae43: Merge "Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h." 
* commit '9979ae4370e7acd4b305fddeca3c24495214a0cf':
  Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h.
 2014-10-01 20:39:56 +00:00
Ying Wang 114a0fca3b Convert comma in split arguments to underscore. 
aapt already does so.
Bug: 16947729

Change-Id: I813fb8cf41b3ec836e6e6d5f68af12dc385169f8
 2014-10-01 12:01:04 -07:00
Ying Wang 89ec798796 Add split apks to the cts package. 
With split apk support, we may have multilple installed files for a
module. Use ALL_MODULES.$(module).BUILT_INSTALLED to make sure get
every split apk included.

Bug: 16947729
Change-Id: I4e41c2586f1b25f4810b67cd1e948aba0cbcf97b
 2014-10-01 11:46:30 -07:00
Dan Albert 2251ea40ba Remove HAVE_(GNU|BSD)_QSORT_R from AndroidConfig.h. 
Change-Id: If2018529a6c067b63e1a59c16c911d63ec2ebbf4
 2014-10-01 10:12:25 -07:00
Ying Wang 1c869bc536 am fc6d5b6a: Allow to add jar resource or manifest even without Java code. 
* commit 'fc6d5b6a947fa80061778639290c0241b93635b4':
  Allow to add jar resource or manifest even without Java code.
 2014-10-01 01:48:43 +00:00
Ying Wang fc6d5b6a94 Allow to add jar resource or manifest even without Java code. 
Change-Id: I2d8fd93f004d9e0c29c71b887810b2624769789e
 2014-09-30 17:32:58 -07:00
Tim Murray 2e5b902ed4 am b7c92e14: am 35dd358c: Merge "Update prebuilt RS clcore location." 
* commit 'b7c92e14f3c55b07ce17d96375781e434e5d3f1a':
  Update prebuilt RS clcore location.
 2014-09-30 23:52:13 +00:00
Chih-Hung Hsieh eca4ce832e am 14012488: am 09cdd500: Merge "Clear all LOCAL_CLANG_*FLAGS*." 
* commit '140124884050264721e22cb08f713a7da76b36d4':
  Clear all LOCAL_CLANG_*FLAGS*.
 2014-09-30 23:52:08 +00:00
Tim Murray b7c92e14f3 am 35dd358c: Merge "Update prebuilt RS clcore location." 
* commit '35dd358cc4fccb062bd90cb1f9404a582b4facd4':
  Update prebuilt RS clcore location.
 2014-09-30 22:40:39 +00:00
Tim Murray 35dd358cc4 Merge "Update prebuilt RS clcore location." 2014-09-30 22:34:59 +00:00
Chih-Hung Hsieh 1401248840 am 09cdd500: Merge "Clear all LOCAL_CLANG_*FLAGS*." 
* commit '09cdd5000caed13a135d3ff62972e002904208c3':
  Clear all LOCAL_CLANG_*FLAGS*.
 2014-09-30 22:08:51 +00:00
Tim Murray 00fa757d7d Update prebuilt RS clcore location. 
Change-Id: Iebf255d7cc093b74e08b1f1378d9b397fd9dd3b9
 2014-09-30 15:08:03 -07:00
Chih-Hung Hsieh 78b6cea65e Clear all LOCAL_CLANG_*FLAGS*. 
Although only some of these flags will be used for some
targets or hosts, they must all be cleared to avoid carrying
over from one project to another.

BUG: 17677366
Change-Id: I6d26fa7e5bf2ff11758728810d4874f3759aebe7
 2014-09-30 21:50:58 +00:00
Ying Wang 912eb7155b am c168b6e2: Merge "the recovery image also needs to be signed with " into lmp-dev 
* commit 'c168b6e27aa48c1d5552ed9143eeb00d2c9860a5':
  the recovery image also needs to be signed with $(BOOT_SIGNER)
 2014-09-30 16:50:04 +00:00
Chet Haase 3577874dc1 am f388993a: Add docs for Palette and CardView 
* commit 'f388993a8f5690cef3ea65f6982e343c53e96941':
  Add docs for Palette and CardView
 2014-09-30 16:50:04 +00:00
Ying Wang c168b6e27a Merge "the recovery image also needs to be signed with $(BOOT_SIGNER)" into lmp-dev 2014-09-30 16:41:08 +00:00
Stephen Hines dc64c7b460 Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler. 
Bug: 14416410

prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32
is the location for the checked-in hermetic mingw Windows compiler. This
removes our reliance on host mingw when building with "make win_sdk".

Change-Id: I1f9bbb85912d9855be32f9cab4bdfd12d6d3246c
 2014-09-30 02:38:41 -07:00
Stephen Hines b34b7aeb31 Switch TBLGEN-related executables to use "BUILD_" instead of "HOST_". 
Bug: 14416410
Change-Id: Ife2d7329795f229adcddc5c57b20aa96c56387c0
 2014-09-30 02:37:20 -07:00
Ying Wang dc050b7b98 am a953de3f: am 326363b8: Merge "java_alternative_checked_module takes precedence." 
* commit 'a953de3f01b3c3428e133b14bad0662b4adc901d':
  java_alternative_checked_module takes precedence.
 2014-09-30 04:17:12 +00:00
Ying Wang a953de3f01 am 326363b8: Merge "java_alternative_checked_module takes precedence." 
* commit '326363b82368efe5a99df558588d5b2f802fe604':
  java_alternative_checked_module takes precedence.
 2014-09-30 00:24:30 +00:00
Ying Wang 8260562434 java_alternative_checked_module takes precedence. 
java_alternative_checked_module takes precedence over
LOCAL_BUILT_MODULE.

Change-Id: I84f0d65dbc05f4686817aa835d003eb0101af146
 2014-09-29 17:17:00 -07:00
Ying Wang e4cd584e1b am 1d6f150e: am 8d856002: Merge "Don\'t modify LOCAL_CHECKED_MODULE." 
* commit '1d6f150e3e3cce1788d0aea47d0aa8bef0f6df66':
  Don't modify LOCAL_CHECKED_MODULE.
 2014-09-29 22:49:31 +00:00
Ying Wang 1d6f150e3e am 8d856002: Merge "Don\'t modify LOCAL_CHECKED_MODULE." 
* commit '8d8560026a75aaa9e4abe7190a1dab3c4732767d':
  Don't modify LOCAL_CHECKED_MODULE.
 2014-09-29 22:45:45 +00:00
Ying Wang 6c1d1cc712 Don't modify LOCAL_CHECKED_MODULE. 
Use a temporary variable my_checked_module instead,
so that we don't override the 2nd_arch's checked module with the
1st_arch's in multilib build.
Note that by default we checkbuild 2nd_arch only for host modules,
but not for target modules.
We enable multlib for target modules by default, it would take too
much time to checkbuild for both archs. For 32-bit modules actually we
can checkbuild a 32-bit product.

Change-Id: I0a5ba75699225b7641442673483731a8fd360d61
 2014-09-29 21:59:55 +00:00
Andrew Boie 194418c3e1 the recovery image also needs to be signed with $(BOOT_SIGNER) 
Change-Id: Ie90976afdaada6410b1566fe497ce86ee935ad41
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Reviewed-on: https://android.intel.com/232319
 2014-09-28 10:48:50 -07:00
Chet Haase f388993a8f Add docs for Palette and CardView 
These new v7 support lib APIs were never added to the make files to
allow docs to be build, so they don't appear in the reference docs.
Adding them to pathmap.mk fixes this.

Issue #17681531 Add docs for CardView and Palette

Change-Id: If9a4562c5e9629dc29791185dd720c6986c2b9a8
 2014-09-28 16:13:19 +00:00
Chih-Hung Hsieh 1184754c22 am b9b2d21c: am 4a8d5c1a: Merge "Add local Clang+target specific flags." 
* commit 'b9b2d21c04d0ba65ad56a26f8306e9afa7d99694':
  Add local Clang+target specific flags.
 2014-09-27 02:59:47 +00:00
Chih-Hung Hsieh b9b2d21c04 am 4a8d5c1a: Merge "Add local Clang+target specific flags." 
* commit '4a8d5c1aaff33a2304850ab66221e0bd4f83003f':
  Add local Clang+target specific flags.
 2014-09-27 02:45:04 +00:00
Chih-Hung Hsieh 4a8d5c1aaf Merge "Add local Clang+target specific flags." 2014-09-27 02:40:28 +00:00
Chih-Hung Hsieh 619fdb8d77 Add local Clang+target specific flags. 
BUG: 17677366
Change-Id: I75522fb56fdf4d27ea1f5f0ae15866b13ae6e206
 2014-09-26 17:19:49 -07:00
Dan Albert 741af79c30 am ec8815f9: am 91adf75c: Merge "Fix detection of C++ STL for tests." 
* commit 'ec8815f96cb0c8c42e59b20c6c29ef91e9b338a1':
  Fix detection of C++ STL for tests.
 2014-09-27 00:13:32 +00:00
Dan Albert ec8815f96c am 91adf75c: Merge "Fix detection of C++ STL for tests." 
* commit '91adf75c3e0f13bab71e573ec4e3731699f7136e':
  Fix detection of C++ STL for tests.
 2014-09-27 00:07:27 +00:00
Dan Albert 683c392e07 Fix detection of C++ STL for tests. 
Target tests weren't approrpiately using the libc++ gtest for
libc++_static, and the hosts tests were still using the old check.

Change-Id: I13813d5f09673b144b2dfead93eb81cb4bae0e34
 2014-09-26 15:45:33 -07:00
Ying Wang c811481734 am a6a6c35c: Return "none" if no matching arch found 
* commit 'a6a6c35c3afdf9c4bcd05ea5e4c40983e7e49246':
  Return "none" if no matching arch found
 2014-09-26 21:57:12 +00:00
Stephen Hines 7a5d35b22a am 145eddfd: am 670018fd: Merge "Remove unnecessary CLANG_CONFIG_EXTRA_*_C_INCLUDES variables." 
* commit '145eddfd229b118fadd4f4f255dbecc1a79b5e2b':
  Remove unnecessary CLANG_CONFIG_EXTRA_*_C_INCLUDES variables.
 2014-09-26 19:53:06 +00:00
Stephen Hines 03b61bea0d am 3041b7d1: am 3cf20570: Merge "Use new variable LLVM_PREBUILTS_VERSION to simplify path construction." 
* commit '3041b7d1f4f457082f8de50bba31adb479731d36':
  Use new variable LLVM_PREBUILTS_VERSION to simplify path construction.
 2014-09-26 19:53:05 +00:00
Stephen Hines 145eddfd22 am 670018fd: Merge "Remove unnecessary CLANG_CONFIG_EXTRA_*_C_INCLUDES variables." 
* commit '670018fdaed33a6872925e60fd95c5f401e45444':
  Remove unnecessary CLANG_CONFIG_EXTRA_*_C_INCLUDES variables.
 2014-09-26 19:45:23 +00:00
Stephen Hines 3041b7d1f4 am 3cf20570: Merge "Use new variable LLVM_PREBUILTS_VERSION to simplify path construction." 
* commit '3cf2057079df33e914640c3fe2b1ef7a10495064':
  Use new variable LLVM_PREBUILTS_VERSION to simplify path construction.
 2014-09-26 19:45:22 +00:00
Stephen Hines 670018fdae Merge "Remove unnecessary CLANG_CONFIG_EXTRA_*_C_INCLUDES variables." 2014-09-26 17:53:34 +00:00
Stephen Hines 3cf2057079 Merge "Use new variable LLVM_PREBUILTS_VERSION to simplify path construction." 2014-09-26 17:53:22 +00:00
Ying Wang a6a6c35c3a Return "none" if no matching arch found 
So result of get-prebuilt-src-arch can be passed to
LOCAL_MODULE_TARGET_ARCH, which takes empty string as "any" actually.

Change-Id: I916c9738ccce4a94ac084fb4141d54659e896a1f
 2014-09-26 10:41:27 -07:00
Ian Rogers ed51a9d21e am d1f73b01: am 577184aa: Merge "Test __GLIBC__ is defined before using its value." 
* commit 'd1f73b018d3815eec54a6614a57ff3e25bbaf64a':
  Test __GLIBC__ is defined before using its value.
 2014-09-26 15:53:57 +00:00
Ian Rogers d1f73b018d am 577184aa: Merge "Test __GLIBC__ is defined before using its value." 
* commit '577184aa86eefc4b7b177eeafcd8209028d86b2d':
  Test __GLIBC__ is defined before using its value.
 2014-09-26 15:48:25 +00:00
Stephen Hines f00896663e Remove unnecessary CLANG_CONFIG_EXTRA_*_C_INCLUDES variables. 
These aren't needed now that we only use the compiler/headers that exist in
the prebuilts/clang directory.

Change-Id: I9978efb10815e92577d45629db324e0a5094f880
 2014-09-25 22:35:16 -07:00
Ian Rogers 850a4cb72b Test __GLIBC__ is defined before using its value. 
Avoids -Wundef warning.

Change-Id: I52d8223500fe31cdf7023e32e96df75e33eb2f7e
 2014-09-25 17:34:40 -07:00
Brett Chabot d771c0971a am fa63bb72: Merge "Remove cts dependency on ddmlib" into lmp-dev 
* commit 'fa63bb72c980a12178bf7e150988a851619a1bd6':
  Remove cts dependency on ddmlib
 2014-09-25 21:15:57 +00:00
Brett Chabot fa63bb72c9 Merge "Remove cts dependency on ddmlib" into lmp-dev 2014-09-25 21:09:41 +00:00
Brett Chabot cf1d2b1796 Remove cts dependency on ddmlib 
Its now included in tradefed-prebuilt.

Bug: 17649015
Change-Id: I058bed467fb739a311b0645b7da6a6b72497c290
 2014-09-25 12:38:36 -07:00
Dianne Hackborn a0fdca5e79 am e105b8f2: Merge "And then L, without ever becoming a real code name, transforms like magic to 5.0." into lmp-dev 
* commit 'e105b8f2d3fd57b9f3f8c83f21fc54bc05c3c4f4':
  And then L, without ever becoming a real code name, transforms like magic to 5.0.
 2014-09-25 00:40:56 +00:00
Dianne Hackborn e105b8f2d3 Merge "And then L, without ever becoming a real code name, transforms like magic to 5.0." into lmp-dev 2014-09-25 00:28:33 +00:00
Lai Wei-Chih 8affa161fe Use new variable LLVM_PREBUILTS_VERSION to simplify path construction. 
This removes the hard-coded '3.5' in the various paths and makes switching to
a new toolchain easier from the command line (m LLVM_PREBUILTS_VERSION=3.6).

Change-Id: I46b10eb2fc177a03528de9c7b433f8647f632081
 2014-09-24 14:59:00 -07:00
Ying Wang 1b2c472579 am a47420a2: Break package-modules build recipe to mutliple lines 
* commit 'a47420a22d83fb5707cb971d98961f87e667ffe8':
  Break package-modules build recipe to mutliple lines
 2014-09-24 17:50:44 +00:00
Ying Wang a47420a22d Break package-modules build recipe to mutliple lines 
To fix "Argument list too long" error seen on some machines.

Change-Id: I6f34668e938412751e257b4b543358e1fc0809a1
 2014-09-24 10:19:14 -07:00
Dan Albert 7655a97984 resolved conflicts for merge of 326f9450 to lmp-dev-plus-aosp 
Change-Id: I66360da623a6e7ac04610c3252f24ed69f7e4b1e
 2014-09-24 09:42:39 -07:00
Dan Albert 326f9450f0 am 33029248: Merge "Add option for generating coverage info." 
* commit '330292480272aed3d7663ae7a7668675c742b2e0':
  Add option for generating coverage info.
 2014-09-24 16:13:18 +00:00
Dan Albert 3302924802 Merge "Add option for generating coverage info." 2014-09-24 16:03:27 +00:00
Dan Albert 4bbc6c790b Add option for generating coverage info. 
To enable building with coverage, the environment variable
NATIVE_COVERAGE must be set to true.

Set `LOCAL_NATIVE_COVERAGE := true` to generate coverage information for
a given component.

This is currently not supported for clang (b/17574078, b/17583330).

If static library A is included in a binary B (dynamic or static
executable, or shared library), and A is built with coverage
information, B is required to link with libgcov.a. Since the make does
not offer a good way to track this dependency, link libgcov.a even if
LOCAL_NATIVE_COVERAGE is not set (but still guarded by NATIVE_COVERAGE).
This ensures that all of the libgcov dependencies will always be
resolved, and causes no change in the resulting binary if coverage is
not used.

Bug: 10134489
Change-Id: Id5a19f2c215e4be80e6eae27ecc19b582f2f6813
 2014-09-23 15:19:02 -07:00
Elliott Hughes f811b82b4d am 31f21208: am cb0755f8: Merge "Remove unused HAVE_OFF64_T." 
* commit '31f2120848d2dcbbe3f2571ce9993d3dabff490f':
  Remove unused HAVE_OFF64_T.
 2014-09-23 21:37:05 +00:00
Elliott Hughes 31f2120848 am cb0755f8: Merge "Remove unused HAVE_OFF64_T." 
* commit 'cb0755f8c92c252331614bee7bceeb897357e0f1':
  Remove unused HAVE_OFF64_T.
 2014-09-23 21:30:09 +00:00
Elliott Hughes 8fe8dc83e3 Remove unused HAVE_OFF64_T. 
Change-Id: I24acf64efcd0fd84d5dda342d4c4293fa59fae1a
 2014-09-23 13:36:01 -07:00
Elliott Hughes 0b1529d064 am 5d76f9e8: am 88c7544e: Merge "Remove the unused IPC macros." 
* commit '5d76f9e8c87ac48b2ff6cceb13cb438c8e6d7064':
  Remove the unused IPC macros.
 2014-09-23 16:16:48 +00:00
Elliott Hughes 5d76f9e8c8 am 88c7544e: Merge "Remove the unused IPC macros." 
* commit '88c7544e711e70273b3ab29251ba2ff359a7ea1a':
  Remove the unused IPC macros.
 2014-09-23 16:11:03 +00:00
Elliott Hughes 76ab00f189 Remove the unused IPC macros. 
There are still a couple of references to HAVE_WIN32_IPC to be dealt with
later.

Change-Id: Id131fbf2e96d4c1c7bb98629779045375bd5f85f
 2014-09-22 20:43:32 -07:00
Elliott Hughes c08b4f0389 am 50bd6b99: am c65d93f6: Merge "build: remove HAVE_OOM_ADJ" 
* commit '50bd6b99796e1ec8d688e5867bfe487d50e21372':
  build: remove HAVE_OOM_ADJ
 2014-09-23 02:09:15 +00:00
Elliott Hughes 50bd6b9979 am c65d93f6: Merge "build: remove HAVE_OOM_ADJ" 
* commit 'c65d93f6964a313f64fee031d8dcdbe996a7204d':
  build: remove HAVE_OOM_ADJ
 2014-09-23 01:54:23 +00:00
Todd Poynor 9c226d1f9e build: remove HAVE_OOM_ADJ 
This define is no longer used.

Change-Id: I6615d6e4aa09f71b7c4c435ccb83a07bba91b6dc
 2014-09-22 18:47:48 -07:00
Dianne Hackborn 105df2f1d2 And then L, without ever becoming a real code name, transforms like magic to 5.0. 
The code name looked at 5.0 despondently.  "Won't anyone care about
me?  Why does everyone pretend like I don't even exist!"  And it
was true -- for all of its life, nobody had ever whispered L's
true name, at least not in the same breath as many other names that
were not L's at all.

But 5.0 knew better.  "L," the number said, "don't you fear.  Some
day, I am sure, your name will go up in lights.  Your name will shine
brighter than even my own.  And everyone who is anyone will know
your name, write pages and pages all about your name, and debate
endlessly about everything you are."

L could only hope this would be true.  But not today.  Today, L
is still nobody.

Change-Id: I2523dd34ff7486badf8c9cd40e43833a5ef448b8
 2014-09-22 15:55:23 -07:00
Ying Wang 4cb0499a5d Allow LOCAL_ASSET_DIR point to nonexistent dir 
LOCAL_ASSET_DIR may point to a dir generated during the build process.
We have done similiar things to LOCAL_RESOURCE_DIR.

(cherry picked from commit bfcdf060ba)

Bug: 16563899
Change-Id: Iaa72196e1e6350ae0720f8a4e0abc68d8d7ed642
 2014-09-20 14:16:09 -07:00
Ying Wang 0379e9f83f am a7ee956e: am b69b7d7f: Merge "Fix recovery image build for 32p" 
* commit 'a7ee956e9dc20fa5a01606b473b18b0c3980762f':
  Fix recovery image build for 32p
 2014-09-20 01:06:48 +00:00
Ying Wang a7ee956e9d am b69b7d7f: Merge "Fix recovery image build for 32p" 
* commit 'b69b7d7fba2a03faa1405da5bde9b6b559c758b2':
  Fix recovery image build for 32p
 2014-09-20 00:49:36 +00:00
Ying Wang b69b7d7fba Merge "Fix recovery image build for 32p" 2014-09-20 00:38:08 +00:00
Elliott Hughes ae9c91b8b1 am a4a57339: am e2f54706: Merge "Remove unused HAVE_EPOLL." 
* commit 'a4a57339f3de18ee3fef962fea925962a49b26a3':
  Remove unused HAVE_EPOLL.
 2014-09-19 23:11:08 +00:00
Elliott Hughes a4a57339f3 am e2f54706: Merge "Remove unused HAVE_EPOLL." 
* commit 'e2f547060678ed4199b9f398b95643e08e6b6959':
  Remove unused HAVE_EPOLL.
 2014-09-19 23:02:38 +00:00
Elliott Hughes e2f5470606 Merge "Remove unused HAVE_EPOLL." 2014-09-19 22:54:17 +00:00
Elliott Hughes 67839a58be Remove unused HAVE_EPOLL. 
The only people who appear to be using this are actually using their own
one.

Change-Id: I349ed4ce3874c1b2f9bad56c93c8ccee88ae9432
 2014-09-19 15:12:56 -07:00
Brian Carlstrom 4d0595b596 am 8c444b61: am b97b1e59: Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug" 
* commit '8c444b61b3d3fab99f9bd617a8d7705c81e8da7a':
  Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug
 2014-09-19 22:01:46 +00:00
Brian Carlstrom 8c444b61b3 am b97b1e59: Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug" 
* commit 'b97b1e59409ea4b873dbb8d83ba73f978ba7fcba':
  Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug
 2014-09-19 21:49:13 +00:00
Brian Carlstrom b97b1e5940 Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug" 2014-09-19 21:41:01 +00:00
Brian Carlstrom 85d56eba99 Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug 
Bug: 17572009
Change-Id: I0cfc1aa2dd93a8dac21d23d813801c74ed37079a
 2014-09-19 11:30:27 -07:00
Dan Albert 220b01ba27 am 92421720: am 98f7742a: Merge "Move selection of C++ STL into the build system." 
* commit '9242172094691c7203ba7cf0a5e5db611ca9032b':
  Move selection of C++ STL into the build system.
 2014-09-19 00:16:16 +00:00
Dan Albert 9242172094 am 98f7742a: Merge "Move selection of C++ STL into the build system." 
* commit '98f7742a7f5bdc69913ba5e15bba2e60ae5cf724':
  Move selection of C++ STL into the build system.
 2014-09-19 00:06:28 +00:00
Dan Albert b05f2ca150 Move selection of C++ STL into the build system. 
Preparing for migration from stlport to libc++. STL selection is done
with LOCAL_CXX_STL (valid values are default, none, libc++,
libc++_static, stlport, stlport_static, bionic).

The selection of the STL is as follows:

    if LOCAL_CXX_STL == 'default'
      ifdef LOCAL_SDK_VERSION
        Use whatever STL the other NDK options have selected.
      else
        Use bionic's libstdc++ for target, GNU libstdc++ for host. This
        is compatible with the existing build options.
      endif
    else
      if LOCAL_CXX_STL == 'stlport'
        Use stlport.
      else if LOCAL_CXX_STL == 'libc++'
        Use libc++.
      else if LOCAL_CXX_STL == ''
        Don't use any STL.
      endif
    endif

Bug: 15193147
Change-Id: If712ba0ae7908d8147a69e29da5c453a183d6540
 2014-09-18 16:38:20 -07:00
Vineeta Srivastava ed719782b6 am 2726211a: Set oem_fingerprint_properties only when it is not empty. 
* commit '2726211a7c843ccea3b345c0821290a5ee656d9b':
  Set oem_fingerprint_properties only when it is not empty.
 2014-09-18 22:19:09 +00:00
Vineeta Srivastava 2726211a7c Set oem_fingerprint_properties only when it is not empty. 
Add oem_fingerprint_properties to misc_info.txt only when it is not empty.
Shamu does not have OEM specific OTA config and oem_fingerprint_properties
does not need to be set in misc_info.txt.

For sprout, it stays the same.

Bug: 16635599
Change-Id: I7e6c6f5ce1f94f8f1b6da0c2f56bc67ff9fc0f1c
 2014-09-18 14:42:28 -07:00
Ying Wang e7296eb23f am 7a899199: Enable multilib odex only if TARGET_2ND_ARCH is defined. 
* commit '7a8991991f6459945782175b0cda7d03fbf6cbde':
  Enable multilib odex only if TARGET_2ND_ARCH is defined.
 2014-09-16 08:32:18 +00:00
Ying Wang e085cdda0a am 88cfa032: Merge "Enable multilib odex only if TARGET_2ND_ARCH is defined." 
* commit '88cfa0324724c7e90bfed3aaa61c27ca0926860b':
  Enable multilib odex only if TARGET_2ND_ARCH is defined.
 2014-09-16 08:22:27 +00:00
Ying Wang 66ee934c91 am 8209d993: Merge "Support to build apk odex for both arch." 
* commit '8209d993da63dcf3ac6b3e9d236e2baf0fcd51a0':
  Support to build apk odex for both arch.
 2014-09-16 08:22:26 +00:00
Bruce Beare 7c02ec91e8 Fix recovery image build for 32p 
When building for 32p, we need to be explicit that we wish to build the 32bit
version of the binaries that will be placed in the recovery image. The recovery
image doesn't actually care... but if we are not explicit in this, the makefiles
will ask for the 64bit binaries but the Android.mk for the binaries will supply
the 32bit images (causing the build to fail)..

Change-Id: I728912bc8e07726888fe8bed4352cbb373911cb7
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
 2014-09-15 18:36:47 -07:00
Ying Wang 96c2af033d Enable multilib odex only if TARGET_2ND_ARCH is defined. 
Bug: 17507247
Bug: 14694978
Change-Id: I160a37bc0970315054606829aa112b67eaee7d49
 2014-09-15 12:12:36 -07:00
Ying Wang 2e9f639282 Support to build apk odex for both arch. 
Build odex for both arch in multilib build if an app has
LOCAL_MULTILIB := both.
Refactored the common setup code to a separate file setup_one_odex.mk.

Bug: 17409149
Bug: 14694978
Change-Id: I74c9426cd74fe0b0cb4811368f740a88ac2ae022
 2014-09-15 12:12:18 -07:00
Ying Wang 7a8991991f Enable multilib odex only if TARGET_2ND_ARCH is defined. 
Bug: 17507247
Bug: 14694978
Change-Id: I160a37bc0970315054606829aa112b67eaee7d49
 2014-09-15 11:45:52 -07:00
Ying Wang 55927b0668 am ce851e88: Merge "Support to build apk odex for both arch." into lmp-dev 
* commit 'ce851e88d9b1a0d934f1a564b3a400782d12e0d3':
  Support to build apk odex for both arch.
 2014-09-14 21:15:57 +00:00
Ying Wang db48da7844 Support to build apk odex for both arch. 
Build odex for both arch in multilib build if an app has
LOCAL_MULTILIB := both.
Refactored the common setup code to a separate file setup_one_odex.mk.

Bug: 17409149
Bug: 14694978
Change-Id: I74c9426cd74fe0b0cb4811368f740a88ac2ae022
 2014-09-13 18:14:15 -07:00
Ying Wang 6d30b05e0e am 5ae4286b: Merge "Conditionally skip boot jars package name check." into lmp-dev 
* commit '5ae4286b94813171982ff7fdebe88fd29fe7e590':
  Conditionally skip boot jars package name check.
 2014-09-12 05:43:07 +00:00
Raphael Moll fac497340f am 24494187: Merge "SDK Addon multi-sys-img support, part 4." into lmp-dev 
* commit '24494187def3472dca81db6ae782c7d1246c1056':
  SDK Addon multi-sys-img support, part 4.
 2014-09-12 05:43:06 +00:00
Ying Wang 5ae4286b94 Merge "Conditionally skip boot jars package name check." into lmp-dev 2014-09-12 01:15:56 +00:00
Ying Wang 46526ff69e Conditionally skip boot jars package name check. 
In PDK build, or when a product adds its own boot jars we skip the
check.

Bug: 17434570
Change-Id: I9096ebfa38280c5d2ca84bdc489b455876103f5d
 2014-09-11 17:40:29 -07:00
Raphael Moll 24494187de Merge "SDK Addon multi-sys-img support, part 4." into lmp-dev 2014-09-11 22:28:40 +00:00
Dan Albert 6692715135 Missed one part of removing the vbox target. 
Change-Id: I8edb5252b5e71de042b79cb9eb2a497d89efb773
(cherry picked from commit bfbd41edcb)
 2014-09-11 13:48:50 -07:00
Ying Wang b091412083 am 48c37182: Merge "Check PRODUCT_BOOT_JARS against a whitelist of package names." into lmp-dev 
* commit '48c37182f0df4ace331d7b546c7840ef67b13883':
  Check PRODUCT_BOOT_JARS against a whitelist of package names.
 2014-09-11 18:32:38 +00:00
Ying Wang 48c37182f0 Merge "Check PRODUCT_BOOT_JARS against a whitelist of package names." into lmp-dev 2014-09-11 18:06:52 +00:00
Dan Albert 588011a905 am 5f8e7ff6: am 1feb478d: Merge "Missed one part of removing the vbox target." 
* commit '5f8e7ff67602a1ac14994c4aad6fd5d194b68d57':
  Missed one part of removing the vbox target.
 2014-09-11 02:54:57 +00:00
Dan Albert 5f8e7ff676 am 1feb478d: Merge "Missed one part of removing the vbox target." 
* commit '1feb478d28cfb427650e4cd2752bcd988b3258e6':
  Missed one part of removing the vbox target.
 2014-09-11 01:42:49 +00:00
Ying Wang 634e7df1c8 am acaada12: Use existing my_32_64_bit_suffix. 
* commit 'acaada12731639e3feba1dd83d7e44765ec8556c':
  Use existing my_32_64_bit_suffix.
 2014-09-10 23:32:46 +00:00
Ying Wang acaada1273 Use existing my_32_64_bit_suffix. 
Change-Id: I75d9733870c37a44ce55ae6cbcfb3f67e1387e9d
 2014-09-10 16:11:41 -07:00
Tim Murray c0bdd15b10 am fabd3c00: Merge "Pass -m32 or -m64 to llvm-rs-cc when reflecting C++." into lmp-dev 
* commit 'fabd3c00b461c921cb745acd62e7b07b4e938241':
  Pass -m32 or -m64 to llvm-rs-cc when reflecting C++.
 2014-09-10 22:58:37 +00:00
Dan Albert bfbd41edcb Missed one part of removing the vbox target. 
Change-Id: I8edb5252b5e71de042b79cb9eb2a497d89efb773
 2014-09-10 15:58:20 -07:00
Tim Murray fabd3c00b4 Merge "Pass -m32 or -m64 to llvm-rs-cc when reflecting C++." into lmp-dev 2014-09-10 22:35:58 +00:00
Tim Murray f0020c6157 Pass -m32 or -m64 to llvm-rs-cc when reflecting C++. 
bug 17417839

Change-Id: Iea4aede874f751ac732c3e3ae7a11e18613edcf5
 2014-09-10 15:11:01 -07:00
Ian Rogers f0d5324fdc Merge "Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:" into lmp-dev 2014-09-10 20:20:51 +00:00
Alexander Ivchenko 4ee006e012 Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64: 
Remove -msse2 for x86 (-mssse3 should be provided by the compiler).
       Remove -fPIC (compiler provides by default).
       Remove -fno-inline-functions-called-once.

Change-Id: Ibb29934224c4eedfff926dc72c3b6342c1861ac9
(cherry picked from commit 388dce3192)
 2014-09-10 11:50:21 -07:00
Ying Wang e987400207 Check PRODUCT_BOOT_JARS against a whitelist of package names. 
The whitelist is a preconfigured list of regular expressions of package
names.
Run the check as a task by default in platform build.

Bug: 17434570
Change-Id: Ieaaf7efb5f4fc7a83677f3675780ca902972be97
 2014-09-10 10:51:58 -07:00
Ying Wang a33c6151b0 am ecc28e95: am 48505328: Merge "Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:" 
* commit 'ecc28e9525e869f72ea0b1c70250db32d2d81e0a':
  Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:
 2014-09-10 17:16:58 +00:00
Ying Wang ecc28e9525 am 48505328: Merge "Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:" 
* commit '48505328c83d644db04703ce35af81d368279fc4':
  Refine TARGET_GLOBAL_CFLAGS for x86 and x86_64:
 2014-09-10 17:05:59 +00:00
Mark Renouf dae144a0dd am ba198020: am 0ab5cc6b: am 99332f11: Allow for opt-in of proguard shrinking of tests with new flag 
* commit 'ba19802001218748940d8b08e57549d1da7a3528':
  Allow for opt-in of proguard shrinking of tests with new flag
 2014-09-10 07:25:00 +00:00
Mark Renouf ba19802001 am 0ab5cc6b: am 99332f11: Allow for opt-in of proguard shrinking of tests with new flag 
* commit '0ab5cc6b8e04e0a07778f3c620a9edac3a40bc4e':
  Allow for opt-in of proguard shrinking of tests with new flag
 2014-09-10 07:01:07 +00:00
Mark Renouf 0ab5cc6b8e am 99332f11: Allow for opt-in of proguard shrinking of tests with new flag 
* commit '99332f11c5cdf1e58eb056c019d3ca8b1e3f034a':
  Allow for opt-in of proguard shrinking of tests with new flag
 2014-09-10 01:42:21 +00:00
Doug Zongker d68530ba9a am 85448773: select default search_path by platform 
* commit '854487739933f7ff33980df0c65d2bcd03b049f9':
  select default search_path by platform
 2014-09-10 00:49:11 +00:00
Mark Renouf 99332f11c5 Allow for opt-in of proguard shrinking of tests with new flag 
By adding 'shrinktests' to LOCAL_PROGUARD_ENABLED, the -dontshrink
flag will be omitted from the resulting proguard config allowing
tests to have unnecessary classes removed before dexxing.

Clockwork is running into 64k method limits on some tests which
depend on GmsCore. On 4.4W (klp-modular-dev) we don't have the
option for multi-dex so proguard is the only solution here.

This change leaves the default behavior unchanged. Shrinking is
still disabled for tests by default unless the 'shrinktests'
flag is set in the Makefile.

Change-Id: Ib586ae9e7f617072b41e95742559bf7c8a6a6ce1
 2014-09-09 20:42:48 -04:00
Doug Zongker 8544877399 select default search_path by platform 
Bug: 17443175
Change-Id: I2b8b0a3b56e667b749ac167a6d09dc973ecf8419
 2014-09-09 15:11:13 -07:00