tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
25211 commits 1 branch 0 tags 119 MiB
Commit graph

8080 commits

Author SHA1 Message Date
Dan Willemsen
58350dee77 Merge "Don't add CFLAGS to CPPFLAGS" 2015-09-24 00:23:27 +00:00
Dan Albert
e166febbbc am ded3f15e: am 782b98ea: Merge changes I3ca9ed36,Ibd7eec5c 
* commit 'ded3f15eeb5d8a29bd8b5b325bf9d4bc6c4a6ecc':
  Revert "Default to hiding libgcc symbols in each object."
  Revert "Don't apply --exclude-libs for the host."
 2015-09-23 23:53:06 +00:00
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 Willemsen
c339398581 Remove trailing / for HOST_TOOLCHAIN_FOR_CLANG 
The darwin version doesn't have a trailing slash. The common case is to
append a path to it:

  $(HOST_TOOLCHAIN_FOR_CLANG)/lib/...

Which means we end up with two slashes.

Change-Id: I74e88924ecfd092c5f7871e188ede0aab29cf65b
 2015-09-23 23:46:44 +00:00
Ying Wang
caeaa08f9d Re-implement mma/mmma using make goals. 
Previously we use command line variable BUILD_MODULES_IN_PATHS which
causes kati to regenerate build.ninja if any variable value changes.

TODO: Remove the old rules of BUILD_MODULES_IN_PATHS in
build/core/main.mk and ninja.mk once users have re-sourced envsetup.sh.
Probably in a few weeks.

Caveat: With this change, if a user sources the new envsetup.sh, mma/mmma
won't work in old branches from the same shell.

Bug: 24309760
Change-Id: I212e82aeebaaa2bd4114e2066f1995da8886b5e2
 2015-09-23 16:31:02 -07:00
Dan Willemsen
3ad3549519 Don't add CFLAGS to CPPFLAGS 
Except for kati, we never use COMMON_GLOBAL_CPPFLAGS without also using
COMMON_GLOBAL_CFLAGS, which leads to duplicate command line entries.

Change-Id: I25d625924e9d157175a9e88bc3f15b7214cfb4ed
 2015-09-23 16:23:02 -07: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
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
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
Colin Cross
f7ca64faa0 Use makeparallel to propagate -j flag to ninja or kati 
When USE_NINJA=true is set, use makeparallel to claim all jobs from make and
pass them to ninja with -j.  If USE_GOMA is set, pass the -j flag to
kati instead so the parallelism can be set in the local_pool instead.

Change-Id: I6e4f957c65683b74533ecb6d33e25de858922823
 2015-09-14 14:41:00 -07:00
Dan Albert
81abed9134 am 91a0082f: am da196abf: Merge "Fix LOCAL_CXX_STL := none for Windows." 
* commit '91a0082fbc69ab77931ec58ea5a5fbf58331d8a5':
  Fix `LOCAL_CXX_STL := none` for Windows.
 2015-09-11 23:05:35 +00:00
Dan Albert
91a0082fbc am da196abf: Merge "Fix LOCAL_CXX_STL := none for Windows." 
* commit 'da196abf10fd9a500fe223952d96cf93ed699983':
  Fix `LOCAL_CXX_STL := none` for Windows.
 2015-09-11 22:14:30 +00:00
Dan Albert
d1d68b19ac Fix LOCAL_CXX_STL := none for Windows. 
We still need to link the various MSVC libraries even if we aren't
using the STL.

Bug: http://b/22953515
Change-Id: I73c35710a6162408e99480a4840eedd291adf7ab
 2015-09-11 13:37:51 -07:00
Shinichiro Hamaji
b94d93e587 am 4bbf8fae: am 6d20af03: Merge "Use the same build.ninja for normal make targets" 
* commit '4bbf8fae1605964b53d32d54db31fbd29db473e7':
  Use the same build.ninja for normal make targets
 2015-09-10 03:44:04 +00:00
Shinichiro Hamaji
4bbf8fae16 am 6d20af03: Merge "Use the same build.ninja for normal make targets" 
* commit '6d20af0391569a2f7b70a6816ddaf316b15e5a70':
  Use the same build.ninja for normal make targets
 2015-09-10 03:37:24 +00:00
Shinichiro Hamaji
6d20af0391 Merge "Use the same build.ninja for normal make targets" 2015-09-10 03:31:59 +00:00
Dan Willemsen
3ff90073e5 am abf6d7a3: am 96d3c0d0: Merge "Update the build system doc" 
* commit 'abf6d7a3c554a95e48fe82f4af44a0960373b904':
  Update the build system doc
 2015-09-10 01:02:15 +00:00
Dan Willemsen
abf6d7a3c5 am 96d3c0d0: Merge "Update the build system doc" 
* commit '96d3c0d0b14e94583438d9e93f011b1b0c930e38':
  Update the build system doc
 2015-09-10 00:53:08 +00:00
Dan Willemsen
0b6c3481d5 Update the build system doc 
This adds a reference to the _{32|64|arm|arm64|...|darwin|linux|windows}
variables, and adds information about how LOCAL_MODULE_HOST_OS works.

It also removes many (but not all) obsolete references.

Bug: 23566667
Change-Id: Ief16a5e245eb65ac00fc23d4fc1b7a409a7a64bd
 2015-09-10 00:20:12 +00:00
Dan Willemsen
8581a8f085 am 749e07c6: am c8db47a0: Merge "Don\'t build windows modules with clang, fix flags" 
* commit '749e07c6483b946ae87ff5efb44460354fb2adf5':
  Don't build windows modules with clang, fix flags
 2015-09-09 23:44:44 +00:00
Dan Willemsen
749e07c648 am c8db47a0: Merge "Don\'t build windows modules with clang, fix flags" 
* commit 'c8db47a0213aa5c204c140cb9268389b4175ae06':
  Don't build windows modules with clang, fix flags
 2015-09-09 23:25:11 +00:00
Dan Willemsen
7728817ab9 Don't build windows modules with clang, fix flags 
shamu checkbuilds set USE_CLANG_PLATFORM_BUILD, which shouldn't apply to
modules built for windows. Also fix some flags that were being set
improperly.

Bug: 23566667
Change-Id: Id4c5b7cc59966328483d90f2b7be3f35e439ecee
 2015-09-09 16:10:50 -07:00
Dan Willemsen
3cf749c78a am c98d9a9d: am f1c09d7f: Merge "Add HOST_CROSS_OS" 
* commit 'c98d9a9d0ff4ae5a99d45d79c43699c302e4e1a3':
  Add HOST_CROSS_OS
 2015-09-09 18:31:08 +00:00
Dan Albert
f5db972506 am 4ecedbc8: am feb3ecaf: Merge "Fix name for NDK protobuf libraries." 
* commit '4ecedbc823f879b78a9c4e7ff25be20a12848d13':
  Fix name for NDK protobuf libraries.
 2015-09-09 18:31:07 +00:00
Dan Willemsen
c98d9a9d0f am f1c09d7f: Merge "Add HOST_CROSS_OS" 
* commit 'f1c09d7fbd92a08cc51950a7d35fb5f7fc564a20':
  Add HOST_CROSS_OS
 2015-09-09 18:19:13 +00:00
Dan Albert
4ecedbc823 am feb3ecaf: Merge "Fix name for NDK protobuf libraries." 
* commit 'feb3ecaff02d2bddb82aae0fa3024d9b9a62169e':
  Fix name for NDK protobuf libraries.
 2015-09-09 18:19:11 +00:00
Dan Willemsen
f1c09d7fbd Merge "Add HOST_CROSS_OS" 2015-09-09 18:13:21 +00:00
Dan Willemsen
057aaea54a Add HOST_CROSS_OS 
Instead of using recursive make to change the HOST_OS when building the
windows SDK under linux, add the concept of cross-building to another
host os.

Bug: 23566667
Change-Id: I6dc525b601b6251d458d197c30bf4660d7485502
 2015-09-09 18:12:29 +00:00
Shinichiro Hamaji
d762bcae25 Use the same build.ninja for normal make targets 
$(PARSE_TIME_MAKE_GOALS) is a list of known goals which affect
parsing of make (e.g., there is $(filter XXX,$(MAKECMDGOALS))).
If the make targets contain one of them, we keep using a
different build.ninja for each combination of make targets.
Otherwise, we use the same build.ninja which has all phony
targets.

Also load vendor/google/build/ninja_config.mk so it can add
Google-specific goals to $(PARSE_TIME_MAKE_GOALS).

Bug: 23685536
Change-Id: I3da5c76fa7644a05a55c374a754212f4fb794818
 2015-09-09 15:48:10 +09:00
Dan Albert
a187fb5986 Fix name for NDK protobuf libraries. 
Name them *-ndk so it's clear which library is which.

Change-Id: I53544a8a97488f902e00d1aedaa021d09ee2f649
 2015-09-08 10:47:03 -07:00
Shinichiro Hamaji
606edc4447 am ebbea4f4: am e711afb1: Merge "Use as a part of ninja suffix" 
* commit 'ebbea4f4e89db421d2f6de4338e2f0c0f5818946':
  Use $(BUILD_MODULES_IN_PATHS) as a part of ninja suffix
 2015-09-07 05:53:43 +00:00