Commit Graph

24617 Commits

Author SHA1 Message Date
Colin Cross ad4b1ef65e am 581a028f: Merge "Remove checkbuild and test from parse time goals"
* commit '581a028fb562b1d877de2b82d6a08df045d73ec8':
  Remove checkbuild and test from parse time goals
2015-09-26 03:37:54 +00:00
Colin Cross 581a028fb5 Merge "Remove checkbuild and test from parse time goals" 2015-09-26 03:33:35 +00:00
Ying Wang 3a3c21cafb am 094116f0: Merge "Remove the unnecessary rs_compatibility_jni_libs install rules."
* commit '094116f0374da3dcba3ff1425f0cb42caf1c6d59':
  Remove the unnecessary rs_compatibility_jni_libs install rules.
2015-09-26 01:06:38 +00:00
Ying Wang 094116f037 Merge "Remove the unnecessary rs_compatibility_jni_libs install rules." 2015-09-26 01:00:14 +00:00
Colin Cross 8449447384 am aaa9d8dc: Merge "Fix windows build"
* commit 'aaa9d8dc0aba0446fb11238f2aa869ce0b33df2f':
  Fix windows build
2015-09-26 00:15:44 +00:00
Colin Cross aaa9d8dc0a Merge "Fix windows build" 2015-09-26 00:09:58 +00:00
Colin Cross 309b420d56 Fix windows build
The windows toolchain doesn't support color, only apply
-fdiagnostics-color to HOST and TARGET, not HOST_CROSS.

Change-Id: I17b999a2852b8d70b2d39a58befa10e2e32c4608
2015-09-25 17:00:14 -07:00
Colin Cross c53d6b90b3 Remove checkbuild and test from parse time goals
The tests goal is not a parse time goal.

The checkbuild goal is only a parse time goal so that it doesn't result
in a circular dependency between droid and checkbuild when
ANDROID_BUILD_EVERYTHING_BY_DEFAULT is set.  Get rid of the circular
dependency by making droid depend on droid_targets, and droid_targets
depend on the targets that are normally built for droid.  checkbuild can
then always depend on droid_targets, and droid can condtionally depend
on checkbuild without introducing a circular dependency.

Bug: 24413153
Change-Id: I231d80e05ffe321384a5efbcdf5578f86ad84da0
2015-09-25 16:43:36 -07:00
Colin Cross cf26cbfb48 am 67020d23: Merge "Link libgtest_main before libgtest"
* commit '67020d2338dd51af5daa3479624acaa494be51a9':
  Link libgtest_main before libgtest
2015-09-25 23:38:29 +00:00
Colin Cross 67020d2338 Merge "Link libgtest_main before libgtest" 2015-09-25 23:30:48 +00:00
Colin Cross ba9bc4d70f am 0d97557d: Merge "Enable color output from gcc and clang"
* commit '0d97557d3d6f56cf6dfdb7552d4f1471d56dfabe':
  Enable color output from gcc and clang
2015-09-25 23:17:02 +00:00
Ying Wang ac30b88dc4 Remove the unnecessary rs_compatibility_jni_libs install rules.
We only build rs_compatibility_jni_libs for unbundled build or when
FORCE_BUILD_RS_COMPAT is set. We don't need to install the
rs_compatibility_jni_libs to system.img in either case.

It's bad idea to install them to system.img, because when two modules
have .rs files with the same name, their installed files conflict.

Change-Id: I7524a301c59396db464f28b17b8f8bf1f15523ca
2015-09-25 16:14:57 -07:00
Colin Cross 3a0a8918b2 Link libgtest_main before libgtest
libgtest_main uses symbols from libgtest.  If libgtest_main is linked
after libgtest, and the test .o files don't reference libgtest (which is
unlikely), then the libgtest .o files will be ignored and libgtest_main
won't be able to find its symbols from libgtest.

Change-Id: Ica3bc679bd9d14e9a3065be927f085cf52faab64
2015-09-25 16:11:31 -07:00
Colin Cross 0d97557d3d Merge "Enable color output from gcc and clang" 2015-09-25 23:10:45 +00:00
Tao Bao c41dc0ad1a am 251d56b8: Merge "releasetools: Update the fingerprint when signing."
* commit '251d56b851af2159df8139639b4a1a1602d60163':
  releasetools: Update the fingerprint when signing.
2015-09-25 21:14:17 +00:00
Tao Bao 251d56b851 Merge "releasetools: Update the fingerprint when signing." 2015-09-25 19:42:28 +00:00
Tao Bao cb7ff77da5 releasetools: Update the fingerprint when signing.
ro.bootimage.build.fingerprint should be updated when signing.

Bug: 22720426
Bug: 24009888
Change-Id: Ib246a257581fd31f90ad6b3d21f39d1a2de24ba8
(cherry picked from commit 265d9aeb62)
2015-09-25 12:41:34 -07:00
David Turner 6af936361b am c6444855: Merge "GPU: add gralloc.ranchu library"
* commit 'c64448550a5148489346f7ba3ac0a686b32dbc26':
  GPU: add gralloc.ranchu library
2015-09-25 17:06:22 +00:00
David Turner c64448550a Merge "GPU: add gralloc.ranchu library" 2015-09-25 16:59:31 +00:00
Christopher Ferris 9937e7b2a3 am 76ec0c4c: Merge "Set mcpu targets based on cpu variant."
* commit '76ec0c4c53aab6fca7af1badab882518962a9755':
  Set mcpu targets based on cpu variant.
2015-09-25 16:35:56 +00:00
Christopher Ferris 76ec0c4c53 Merge "Set mcpu targets based on cpu variant." 2015-09-25 16:29:33 +00:00
Colin Cross 63e3b0294f Enable color output from gcc and clang
Force gcc and clang to always output color diagnostics.  Ninja will
strip the ANSI color codes if it is not running in a terminal.

Bug: 24273983
Change-Id: Ic9252549bfacf3bbb3f4b9d20f63010fc24ac21d
2015-09-24 22:39:17 -07:00
Shinichiro Hamaji 886caa4405 am 77d17b6c: Merge "Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS""
* commit '77d17b6c0b485a9ac45f52e9c5b908b4efec593f':
  Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
2015-09-25 05:31:51 +00:00
Shinichiro Hamaji 77d17b6c0b Merge "Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"" 2015-09-25 05:27:59 +00:00
Shinichiro Hamaji 5ff665d407 Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
This reverts commit cb31f040e3.

This could be the cause of an internal build breakage.

Change-Id: Ic5d2a2ce1f2d214a8201db5c570682d8336763b9
2015-09-25 14:21:37 +09:00
Shinichiro Hamaji f10727ff06 am 4f40525f: Merge "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
* commit '4f40525f782348a64674222be54f5aae3367157c':
  Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS
2015-09-25 05:07:34 +00:00
Shinichiro Hamaji 4f40525f78 Merge "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS" 2015-09-25 04:59:29 +00:00
Shinichiro Hamaji cb31f040e3 Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS
Only goals that modify the parsing need to be passed to kati, filter out
everything else and only pass it to ninja.

Also, always specify --gen_all_phony_targets. With this flag, kati emits
all phony targets in the ninja file so a ninja file generated only with
PARSE_TIME_MAKE_GOALS can handle targets which don't change the parsing.

Bug: 24339367
Change-Id: I63237160c3c86817b53635665d56906790ec4e6a
2015-09-25 13:49:46 +09:00
Shinichiro Hamaji 5d1006cab6 am 3c524993: Merge "Make it possible to change the number of remote jobs"
* commit '3c524993c7d18cd9396a4d014c58039478c21e3e':
  Make it possible to change the number of remote jobs
2015-09-25 04:42:46 +00:00
Shinichiro Hamaji 3c524993c7 Merge "Make it possible to change the number of remote jobs" 2015-09-25 04:34:37 +00:00
Shinichiro Hamaji 412e7ee1f9 am 6b37c7b3: Merge "Allow USE_GOMA=true without explicit USE_NINJA=true"
* commit '6b37c7b32af667f6a42b397a27add34d3c59e5fa':
  Allow USE_GOMA=true without explicit USE_NINJA=true
2015-09-25 04:28:50 +00:00
Shinichiro Hamaji 6b37c7b32a Merge "Allow USE_GOMA=true without explicit USE_NINJA=true" 2015-09-25 04:23:28 +00:00
Colin Cross 45b0c8f163 am c180dd0b: Merge "Revert "disable Krait for Mac builds to avoid assembler issues""
* commit 'c180dd0bfc55ae222f143dc86a333caf000cbf03':
  Revert "disable Krait for Mac builds to avoid assembler issues"
2015-09-25 01:11:48 +00:00
Colin Cross c180dd0bfc Merge "Revert "disable Krait for Mac builds to avoid assembler issues"" 2015-09-25 01:07:52 +00:00
Colin Cross 737cc70b50 Revert "disable Krait for Mac builds to avoid assembler issues"
This doesn't seem to be a problem any more, and mac builds
that differ from linux builds is causing other problems.

This reverts commit 7c40fb95dc.

Bug: 24339250
Change-Id: I8a0da11df42d58ba9c3ded4571f1db870f400a21
2015-09-25 00:30:34 +00:00
Steve Fung f3ec82729a am fdec88c9: Merge "Generate breakpad symbols"
* commit 'fdec88c9726687f98448ccff7670bc843f77bf66':
  Generate breakpad symbols
2015-09-25 00:03:21 +00:00
Ying Wang 945bc2f288 am 92facb1f: Merge "Substitue "/" with "-" in the MODULES-IN phony goal names."
* commit '92facb1fed26492746aca267df51b6082286521c':
  Substitue "/" with "-" in the MODULES-IN phony goal names.
2015-09-24 23:59:29 +00:00
Steve Fung fdec88c972 Merge "Generate breakpad symbols" 2015-09-24 23:57:42 +00:00
Ying Wang 92facb1fed Merge "Substitue "/" with "-" in the MODULES-IN phony goal names." 2015-09-24 23:53:24 +00:00
Steve Fung cb2e67fdb7 Generate breakpad symbols
When BREAKPAD_GENERATE_SYMBOLS is set to true, generate breakpad
symbols for binaries.

Bug: 23900817
Change-Id: I7b992d819350f4f80df5868d16f13016502dfca0
2015-09-24 16:49:40 -07:00
Ying Wang 61cd884a11 Substitue "/" with "-" in the MODULES-IN phony goal names.
This avoids Ninja's path canonicalization on those goal names.
Without this, Ninja complains about duplicate rules for
MODULES-IN/a/b/.. and MODULES-IN/a.

Bug: 24309760
Change-Id: Id3aa9da5d3887a2cd1426cbb5fdf35659c65805e
2015-09-24 16:24:42 -07:00
Elliott Hughes b101f73be9 am 43bbbf8a: Merge "Remove more of the pathmap."
* commit '43bbbf8a15cfc03ce99d0b6a49992b25cf51fc39':
  Remove more of the pathmap.
2015-09-24 21:59:58 +00:00
Elliott Hughes 43bbbf8a15 Merge "Remove more of the pathmap." 2015-09-24 21:50:42 +00:00
Dan Albert cc66e98e79 am 880f05f4: Merge "Use exported includes for libc++."
* commit '880f05f4f28df672eb4ff4ce6b7735480deb13ae':
  Use exported includes for libc++.
2015-09-24 21:43:54 +00:00
Dan Willemsen af6d2d8754 am aeaa0f5c: Merge "Turn shared library multilib warnings into errors"
* commit 'aeaa0f5c580356c0d74dd11e00fb29ae67d97f2b':
  Turn shared library multilib warnings into errors
2015-09-24 21:38:46 +00:00
Dan Albert 880f05f4f2 Merge "Use exported includes for libc++." 2015-09-24 21:38:21 +00:00
Dan Albert eb3e3fa5da Use exported includes for libc++.
Change-Id: Ia5d9c857a43975448a8c2b489cc29be0fa67ddf6
2015-09-24 14:09:09 -07:00
Christopher Ferris 561b4c1995 Set mcpu targets based on cpu variant.
Make cortex-a53 and cortex-a53.a57 use cortex-a7.

Change-Id: I89d5b3f044c867ec99aae319eafc33f2edf1f9f2
2015-09-24 13:59:33 -07:00
Dan Willemsen aeaa0f5c58 Merge "Turn shared library multilib warnings into errors" 2015-09-24 20:59:20 +00:00
Dan Willemsen 7cc88b794d Turn shared library multilib warnings into errors
When caught later, these just get turned into warnings with
unpredictable results, or non-obvious errors.

Change-Id: Ie7ba88e97dc5bedd6cf850748d79693711ac41da
2015-09-24 13:21:11 -07:00