Dan Albert
ded3f15eeb
am 782b98ea
: Merge changes I3ca9ed36,Ibd7eec5c
...
* commit '782b98eaa1c02d935b338f7317fef139067291bb':
Revert "Default to hiding libgcc symbols in each object."
Revert "Don't apply --exclude-libs for the host."
2015-09-23 23:47:37 +00:00
Dan Albert
b77aedbf1e
Revert "Default to hiding libgcc symbols in each object."
...
This reverts commit 021b7651a5
.
Bug: http://b/24166967
Change-Id: I3ca9ed36fa3b55c7eb129c209903676879720acd
2015-09-23 16:18:18 -07:00
Dan Albert
31927f76a3
Revert "Don't apply --exclude-libs for the host."
...
This reverts commit 1576da248c
.
Bug: http://b/24166967
Change-Id: Ibd7eec5c261e85a0474243991be7ee1860c9e14d
2015-09-23 16:18:03 -07: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
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
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
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
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
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
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
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
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
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
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
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
Christopher Ferris
6a2f28514c
Add the common directory back to kernel headers.
...
There will only be a very small set of non-uapi headers. This is
mostly being done for the scsi headers since the kernel has not
made uapi versions of all of them.
Change-Id: I44904b07ff96de918dc5fcab4e5f117a34cb2a87
2015-09-17 21:20:03 -07:00
Dan Albert
e92d25f296
Don't re-export libgcc symbols from every object.
...
Target modules shouldn't re-export libgcc.a because we don't want
other binaries importing them when they should be getting their own
copy of the builtins.
Bug: http://b/24166967
Change-Id: Iaa208933885375da4a8e1b8935f76e9f3ea0647f
2015-09-17 17:18:12 -07:00
Scott James Remnant
d8f08571b3
am 909fe8e0
: Merge "build: support compiling .mm on host"
...
* commit '909fe8e0f7da8db09a004ef44a90e786c81df5e4':
build: support compiling .mm on host
2015-09-17 23:15:30 +00:00
Scott James Remnant
dd86e5a0de
build: support compiling .mm on host
...
libchrome uses .mm (Objective-C++) files to bridge C++ code with
OS X Frameworks. This adds support for compiling .mm to .o by just
using the existing C++ support.
Bug: 24168923
Change-Id: Ia65357e2e2584dfffcb6796e214fe6b27635c3a6
2015-09-17 15:51:32 -07:00
Dan Albert
d9f9836e5e
am 3ee9daac
: Merge "Remove WITHOUT_(HOST|TARGET)_CLANG."
...
* commit '3ee9daac6a3bf8d2a9030b99f62595330f22cafa':
Remove WITHOUT_(HOST|TARGET)_CLANG.
2015-09-16 23:31:41 +00:00
Dan Albert
3ee9daac6a
Merge "Remove WITHOUT_(HOST|TARGET)_CLANG."
2015-09-16 23:24:40 +00:00
Ying Wang
bc195b36d7
am 6fb36397
: Merge "Use /ninja_build to mark ninja build."
...
* commit '6fb36397e56336e08a75e7101d6d47a98a27aea1':
Use $(OUT_DIR)/ninja_build to mark ninja build.
2015-09-16 23:21:04 +00:00
Dan Albert
32f7ff14ce
Remove WITHOUT_(HOST|TARGET)_CLANG.
...
This is unused.
Change-Id: Ibc461fef02c82d110718003aceffb943c930ffe6
2015-09-16 15:43:00 -07:00
Ying Wang
eb1e18e689
Use $(OUT_DIR)/ninja_build to mark ninja build.
...
Bug: 23565895
Change-Id: I000e88a45278fd52096312262eacc52511f02efb
2015-09-16 15:29:08 -07:00
Ying Wang
942672d82b
am 45075cf6
: Merge "Generate installed-files-vendor.txt"
...
* commit '45075cf623fc59930594ac27c675cd43e36975b1':
Generate installed-files-vendor.txt
2015-09-15 23:10:16 +00:00
Ying Wang
8da19e3688
Generate installed-files-vendor.txt
...
Similar to installed-files.txt, installed-files-vendor.txt lists the
content of vendor.img.
Bug: 24009297
Change-Id: Ib8112b19cc9f54d0c0d6a829063e4fe72d8ce664
2015-09-15 14:24:00 -07:00
Dan Willemsen
ca72e5eb61
am b384eb84
: Merge "kati: Handle MAKECMDGOALS modifications"
...
* commit 'b384eb84c3bbea9630d805f5825320e7f9acc2ba':
kati: Handle MAKECMDGOALS modifications
2015-09-15 00:35:13 +00:00