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
Ying Wang
b79e8771ae
Don't add build number to apps' version name for platform build.
...
Bug: 24201956
Change-Id: I4a4bb483bb7b1bf7b7a856050d548bee4db0fe93
2015-09-21 15:13:09 -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
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
e9d4b29272
am d8f08571
: am 909fe8e0
: Merge "build: support compiling .mm on host"
...
* commit 'd8f08571b3ce2161076be665e593fb993c48464a':
build: support compiling .mm on host
2015-09-17 23:26:06 +00: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
0c24a1ff90
am d9f9836e
: am 3ee9daac
: Merge "Remove WITHOUT_(HOST|TARGET)_CLANG."
...
* commit 'd9f9836e5e0e3b6aae2e1289486b9be7dc7dda5a':
Remove WITHOUT_(HOST|TARGET)_CLANG.
2015-09-16 23:40:38 +00: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
Ying Wang
58de128998
am bc195b36
: am 6fb36397
: Merge "Use /ninja_build to mark ninja build."
...
* commit 'bc195b36d7fa0cbd35d12449d37f8aefb60ea946':
Use $(OUT_DIR)/ninja_build to mark ninja build.
2015-09-16 23:26: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
8b037b6765
am 942672d8
: am 45075cf6
: Merge "Generate installed-files-vendor.txt"
...
* commit '942672d82b7be88c252ff4c979039eb40349cef0':
Generate installed-files-vendor.txt
2015-09-15 23:21:11 +00: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
60d1341d22
am ca72e5eb
: am b384eb84
: Merge "kati: Handle MAKECMDGOALS modifications"
...
* commit 'ca72e5eb6115570207a044c146fbdca07257c642':
kati: Handle MAKECMDGOALS modifications
2015-09-15 00:42:05 +00: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
Colin Cross
b690d4e955
am e173cb8b
: am 4ce3cea7
: Merge changes I6e4f957c,Id41a2d81
...
* commit 'e173cb8b38ab2ac8eb1b5373eb2987516aacdeb3':
Use makeparallel to propagate -j flag to ninja or kati
Implement makeparallel
2015-09-15 00:30:41 +00:00
Dan Willemsen
b384eb84c3
Merge "kati: Handle MAKECMDGOALS modifications"
2015-09-15 00:28:42 +00:00
Colin Cross
e173cb8b38
am 4ce3cea7
: Merge changes I6e4f957c,Id41a2d81
...
* commit '4ce3cea77065396b81a4e50283b785e9cc64788f':
Use makeparallel to propagate -j flag to ninja or kati
Implement makeparallel
2015-09-15 00:25:06 +00:00
Dan Willemsen
cb1bd116ed
kati: Handle MAKECMDGOALS modifications
...
For some special targets (PRODUCT-%), the MAKECMDGOALS variable is
modified. Before this change, using one would result in a "no rule to
make target" error, since the new target was not stubbed out.
Change-Id: I879642a48b84a66789d4bdb7db1b6fd1130819b7
2015-09-14 16:30:51 -07:00