Commit Graph

8323 Commits

Author SHA1 Message Date
Dan Willemsen
4d66adfd0e Sort all files found via $(shell find)
Don't rely on filesystem ordering to make these the same for all builds.

Change-Id: I7313062157764091acecf45f4b57405c28858546
2015-09-23 15:35:52 -07:00
Colin Cross
b49b22d1b3 am 48a368d1: am 87e0e8a7: Merge "Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS""
* commit '48a368d1c68c35716e286cec916bf093f9f2da34':
  Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
2015-09-23 22:07:37 +00:00
Colin Cross
48a368d1c6 am 87e0e8a7: Merge "Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS""
* commit '87e0e8a7642bd1f5bfdb7b8313df60a77119690a':
  Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
2015-09-23 22:00:23 +00:00
Colin Cross
87e0e8a764 Merge "Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"" 2015-09-23 21:53:08 +00:00
Colin Cross
84a8ca3173 Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
If there are any goals on the command line, kati hides targets that are
not dependencies of those goals.  Revert this until kati is modified to
include all targets.

This reverts commit b71d24931c.

Bug: 24339367
Change-Id: I7c3a950aef8efc9a0eb72bd29ee07710d2faca99
2015-09-23 21:49:27 +00:00
Colin Cross
99042281ce am b4b65dbc: am f8579330: Merge "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
* commit 'b4b65dbcdbabe25f33342e44e5891bbb1fc7e3ed':
  Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS
2015-09-23 21:08:04 +00:00
Colin Cross
b4b65dbcdb am f8579330: Merge "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
* commit 'f8579330a5f6dea88a4d96e4d34ec165a7563030':
  Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS
2015-09-23 21:03:03 +00:00
Bill Yi
3492be80e1 Merge "Restore AOSP-style version numbers - DO NOT MERGE" into stage-aosp-master 2015-09-23 20:54:42 +00:00
Colin Cross
f8579330a5 Merge "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS" 2015-09-23 20:54:16 +00:00
Dan Albert
bbf62b44b5 am 84a50003: am a41dd0a9: Merge "Don\'t apply --exclude-libs for the host."
* commit '84a500039db9f77973ef9bfe0955df4eaa2244dc':
  Don't apply --exclude-libs for the host.
2015-09-23 20:48:15 +00:00
Dan Albert
84a500039d am a41dd0a9: Merge "Don\'t apply --exclude-libs for the host."
* commit 'a41dd0a973ad9b890a4e2fe558ad6ed038bacdef':
  Don't apply --exclude-libs for the host.
2015-09-23 20:42:33 +00:00
Dan Albert
1576da248c Don't apply --exclude-libs for the host.
The Mac linker doesn't support this flag, and we don't actually need
it there anyway because we link dynamically to the system's compiler
runtime lib.

Bug: http://b/24166967
Change-Id: I62a926ed39d9fc487638e0c1a172762503dd633e
2015-09-23 13:32:14 -07:00
Dan Albert
3677ab8e07 am 0b8113ee: am c496b259: Merge "Default to hiding libgcc symbols in each object."
* commit '0b8113ee089bc1fa431d0a119e4f9a2182e4f859':
  Default to hiding libgcc symbols in each object.
2015-09-23 20:22:05 +00:00
Dan Albert
0b8113ee08 am c496b259: Merge "Default to hiding libgcc symbols in each object."
* commit 'c496b259b8dddf0eac71a50f5e258da4a353d6bb':
  Default to hiding libgcc symbols in each object.
2015-09-23 20:15:37 +00:00
Dan Albert
c496b259b8 Merge "Default to hiding libgcc symbols in each object." 2015-09-23 20:08:09 +00:00
Bill Yi
5a2f585d82 Restore AOSP-style version numbers - DO NOT MERGE
Change-Id: Icc9bc2c03d47e1c02d3b535719862e55a9f9b7cd
2015-09-23 12:38:58 -07:00
Ying Wang
8767ff3bb8 am f695144f: am 56dca5b5: Merge "Use md5sum as the build.ninja filename suffix if the suffix gets too long."
* commit 'f695144fd450b5b38a652ac8af985dbb17f2c3e7':
  Use md5sum as the build.ninja filename suffix if the suffix gets too long.
2015-09-22 23:57:24 +00:00
Ying Wang
f695144fd4 am 56dca5b5: Merge "Use md5sum as the build.ninja filename suffix if the suffix gets too long."
* commit '56dca5b5408834ff36455d8112e737e968bb6320':
  Use md5sum as the build.ninja filename suffix if the suffix gets too long.
2015-09-22 23:50:34 +00:00
Dan Albert
021b7651a5 Default to hiding libgcc symbols in each object.
Bug: http://b/24166967
Change-Id: I3dba264ae70a2e13b3edee7575139e86ef49be71
2015-09-22 16:49:28 -07:00
Ying Wang
127da9e4aa Use md5sum as the build.ninja filename suffix if the suffix gets too long.
Use md5sum as the build.ninja filename suffix if the suffix is longer
than 64 characters. Also store the original suffix in a corresponding
.suf file for human lookup.
This fixes the "File name too long" error when kati tries to write to
build.ninja with the long original suffix.

Bug: 24302576
Change-Id: Ie04b0c14e1a9d593aa5c2a6b357b19a9e8a7158e
2015-09-22 16:16:12 -07:00
Colin Cross
b71d24931c 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.

Change-Id: I28788a3409d601fe838749bcf15394bc8f3d775b
2015-09-22 14:24:00 -07:00
Ying Wang
f0f8bc2118 am d6679fbc: am 9412efdc: Merge "Don\'t build otatools.zip if we don\'t build the ota package."
* commit 'd6679fbc7e3fdafa4b8b2f554f5f53fef00af696':
  Don't build otatools.zip if we don't build the ota package.
2015-09-22 18:56:57 +00:00
Ying Wang
d6679fbc7e am 9412efdc: Merge "Don\'t build otatools.zip if we don\'t build the ota package."
* commit '9412efdc1b9f54e1bc8df3ea3e8e34b7d899cc70':
  Don't build otatools.zip if we don't build the ota package.
2015-09-22 18:50:52 +00:00
Ying Wang
bd2d024778 Don't build otatools.zip if we don't build the ota package.
Also added flag TARGET_SKIP_OTA_PACKAGE to allow product to skip ota
package.

Bug: 24295339
Change-Id: Ib613ed747528661a6572b577cd54ccb6c2d1fdc8
2015-09-22 11:41:59 -07:00
Colin Cross
8c33b95205 am 425d0248: am 9ff24387: Merge "Make USE_NINJA=true the default"
* commit '425d0248a1949208de7b715155ad0d6036c46bc1':
  Make USE_NINJA=true the default
2015-09-22 17:22:03 +00:00
Colin Cross
425d0248a1 am 9ff24387: Merge "Make USE_NINJA=true the default"
* commit '9ff24387c205da60e3d7deb042530b1d0b2d881c':
  Make USE_NINJA=true the default
2015-09-22 17:12:43 +00:00
Colin Cross
9ff24387c2 Merge "Make USE_NINJA=true the default" 2015-09-22 17:05:22 +00:00
Zach Jang
1a78a8e7fb Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
Change-Id: I80e1e5766c33f1a5c1e28e456dfe902bc8886fd4
2015-09-21 17:42:49 -07:00
Dan Albert
d897bc6e10 am 1721cbcb: am 30b32620: Merge "Revert "Don\'t re-export libgcc symbols from every object.""
* commit '1721cbcb0d929ac4cb7d50898f714f30e020b967':
  Revert "Don't re-export libgcc symbols from every object."
2015-09-21 19:51:01 +00:00
Dan Albert
1721cbcb0d am 30b32620: Merge "Revert "Don\'t re-export libgcc symbols from every object.""
* commit '30b326206ba0148da32c1419f210bd6e6890236d':
  Revert "Don't re-export libgcc symbols from every object."
2015-09-21 19:40:55 +00:00
Dan Albert
30b326206b Merge "Revert "Don't re-export libgcc symbols from every object."" 2015-09-21 19:20:24 +00:00
Dan Albert
5408ff73d6 Revert "Don't re-export libgcc symbols from every object."
For some reason shamu doesn't boot after this change.

Bug: http://b/24166967

This reverts commit e92d25f296.

Change-Id: Ibd90c0fccb1fe7446f959c937963d1aa4e43c37c
2015-09-21 19:19:02 +00:00
Ying Wang
697c61d88e am 197e592e: am 3c4c3418: Merge "Don\'t add build number to apps\' version name for platform build."
* commit '197e592ea5d08353b0e3586a7523df86b9cb929c':
  Don't add build number to apps' version name for platform build.
2015-09-20 03:49:39 +00:00
Ying Wang
197e592ea5 am 3c4c3418: Merge "Don\'t add build number to apps\' version name for platform build."
* commit '3c4c34183a10fd3deac81a8fc1fed8c774f12190':
  Don't add build number to apps' version name for platform build.
2015-09-20 03:41:43 +00:00
Colin Cross
7f908a438b am a084f2c7: am 0881ce18: Merge changes Ic1be7572,Id6481430
* commit 'a084f2c73b905ab4906eb5e7aad593bd6fa222e6':
  Pass --ninja to makeparallel for ninja
  makeparallel: improve support for wrapping ninja
2015-09-19 19:59:59 +00:00
Christopher Ferris
b00b6416cb am 2649e750: am 9bc462c1: Merge "Add the common directory back to kernel headers."
* commit '2649e750b6a5a846c8014b0117670f4d15b28684':
  Add the common directory back to kernel headers.
2015-09-19 19:59:58 +00:00
Colin Cross
a084f2c73b am 0881ce18: Merge changes Ic1be7572,Id6481430
* commit '0881ce1817395d62d2746a14350767bf411f89d4':
  Pass --ninja to makeparallel for ninja
  makeparallel: improve support for wrapping ninja
2015-09-19 19:52:44 +00:00
Christopher Ferris
2649e750b6 am 9bc462c1: Merge "Add the common directory back to kernel headers."
* commit '9bc462c12a5c4519b00e988b738c029c688c12d5':
  Add the common directory back to kernel headers.
2015-09-19 19:52:16 +00:00
Ying Wang
d75d893da8 Don't add build number to apps' version name for platform build.
Bug: 24201956
Change-Id: I4a4bb483bb7b1bf7b7a856050d548bee4db0fe93
2015-09-19 10:56:35 -07:00
Colin Cross
0881ce1817 Merge changes Ic1be7572,Id6481430
* changes:
  Pass --ninja to makeparallel for ninja
  makeparallel: improve support for wrapping ninja
2015-09-18 23:33:59 +00:00
Colin Cross
f77030bb30 Make USE_NINJA=true the default
Build with kati + ninja by default, unless specifically disabled with
USE_NINJA=false in the environment or on the make command line.

Bug: 23565895
Change-Id: I1fa9f5c6eb4d4ed3f5b81454f89d19fd2f1f6abb
2015-09-18 15:10:21 -07:00
Colin Cross
af6c071a5f Pass --ninja to makeparallel for ninja
When parallelism is being handled by ninja, pass --ninja to makeparallel
to have it translate -j with no number to default ninja parallelism, and
-k to -k0.

Bug: 24199503
Change-Id: Ic1be7572f93b33e4a71ed23e9e73dea1d4255703
2015-09-18 15:02:40 -07:00
Christopher Ferris
9bc462c12a Merge "Add the common directory back to kernel headers." 2015-09-18 20:44:58 +00:00
Evgenii Stepanov
1cb3285e8d am f267f714: am 908260a5: Merge "Add support of SANITIZE_TARGET=\'address coverage\' for fuzzing."
* commit 'f267f7147fe74b6d523b8f3b700bef276f2782bb':
  Add support of SANITIZE_TARGET='address coverage' for fuzzing.
2015-09-18 20:41:48 +00:00
Evgenii Stepanov
f267f7147f am 908260a5: Merge "Add support of SANITIZE_TARGET=\'address coverage\' for fuzzing."
* commit '908260a56631cad51196c7b197f720bc88d7f5c7':
  Add support of SANITIZE_TARGET='address coverage' for fuzzing.
2015-09-18 20:31:54 +00:00
Evgenii Stepanov
908260a566 Merge "Add support of SANITIZE_TARGET='address coverage' for fuzzing." 2015-09-18 20:21:54 +00:00
Ivan Krasin
74b32b8dfc Add support of SANITIZE_TARGET='address coverage' for fuzzing.
Also, add trace-cmp instrumentation to fuzz_test and host_fuzz_test.

Bug: 22850550
Change-Id: Ifff7b8be693ae991feb0a64e19439370a19b2748
2015-09-18 11:54:43 -07:00
Dan Albert
823a9c8c47 am 5397ba55: am 000e1a97: Merge "Don\'t re-export libgcc symbols from every object."
* commit '5397ba55840162c7e1ae833320bcdcd6140b6c2a':
  Don't re-export libgcc symbols from every object.
2015-09-18 17:35:56 +00:00
Dan Albert
5397ba5584 am 000e1a97: Merge "Don\'t re-export libgcc symbols from every object."
* commit '000e1a973ec83cb2af644ce72a46f1c026299a7d':
  Don't re-export libgcc symbols from every object.
2015-09-18 17:29:22 +00:00
Dan Albert
000e1a973e Merge "Don't re-export libgcc symbols from every object." 2015-09-18 17:21:13 +00:00