OSDN Git Service
Dan Willemsen [Thu, 24 Sep 2015 02:20:38 +0000 (02:20 +0000)]
am
b6a3ede5: Merge "Remove trailing / for HOST_TOOLCHAIN_FOR_CLANG"
* commit '
b6a3ede5506bec89618519bf4a8adb635e570e89':
Remove trailing / for HOST_TOOLCHAIN_FOR_CLANG
Dan Willemsen [Thu, 24 Sep 2015 02:20:36 +0000 (02:20 +0000)]
am
58350dee: Merge "Don\'t add CFLAGS to CPPFLAGS"
* commit '
58350dee77bbfadaea7bce9ee83555dba4963d92':
Don't add CFLAGS to CPPFLAGS
Dan Willemsen [Thu, 24 Sep 2015 00:42:26 +0000 (00:42 +0000)]
Merge "Remove trailing / for HOST_TOOLCHAIN_FOR_CLANG"
Dan Willemsen [Thu, 24 Sep 2015 00:23:27 +0000 (00:23 +0000)]
Merge "Don't add CFLAGS to CPPFLAGS"
Dan Albert [Wed, 23 Sep 2015 23:47:37 +0000 (23:47 +0000)]
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."
Dan Willemsen [Tue, 22 Sep 2015 23:52:18 +0000 (16:52 -0700)]
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
Dan Albert [Wed, 23 Sep 2015 23:42:13 +0000 (23:42 +0000)]
Merge changes I3ca9ed36,Ibd7eec5c
* changes:
Revert "Default to hiding libgcc symbols in each object."
Revert "Don't apply --exclude-libs for the host."
Dan Willemsen [Tue, 22 Sep 2015 23:52:58 +0000 (16:52 -0700)]
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
Dan Albert [Wed, 23 Sep 2015 23:17:28 +0000 (16:17 -0700)]
Revert "Default to hiding libgcc symbols in each object."
This reverts commit
021b7651a5fcb806d1b8a767c7f4a0a81bc8e4ff.
Bug: http://b/
24166967
Change-Id: I3ca9ed36fa3b55c7eb129c209903676879720acd
Dan Albert [Wed, 23 Sep 2015 23:17:15 +0000 (16:17 -0700)]
Revert "Don't apply --exclude-libs for the host."
This reverts commit
1576da248c4a061d906778c2c1dac7478abcc510.
Bug: http://b/
24166967
Change-Id: Ibd7eec5c261e85a0474243991be7ee1860c9e14d
Colin Cross [Wed, 23 Sep 2015 22:00:23 +0000 (22:00 +0000)]
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"
Colin Cross [Wed, 23 Sep 2015 21:53:08 +0000 (21:53 +0000)]
Merge "Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS""
Colin Cross [Wed, 23 Sep 2015 21:48:34 +0000 (21:48 +0000)]
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
b71d24931c7a18799249e3c7f7f6de20ac76cc75.
Bug:
24339367
Change-Id: I7c3a950aef8efc9a0eb72bd29ee07710d2faca99
Colin Cross [Wed, 23 Sep 2015 21:03:03 +0000 (21:03 +0000)]
am
f8579330: Merge "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
* commit '
f8579330a5f6dea88a4d96e4d34ec165a7563030':
Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS
Bill Yi [Wed, 23 Sep 2015 20:54:42 +0000 (20:54 +0000)]
Merge "Restore AOSP-style version numbers - DO NOT MERGE" into stage-aosp-master
Colin Cross [Wed, 23 Sep 2015 20:54:16 +0000 (20:54 +0000)]
Merge "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
Dan Albert [Wed, 23 Sep 2015 20:42:33 +0000 (20:42 +0000)]
am
a41dd0a9: Merge "Don\'t apply --exclude-libs for the host."
* commit '
a41dd0a973ad9b890a4e2fe558ad6ed038bacdef':
Don't apply --exclude-libs for the host.
Dan Albert [Wed, 23 Sep 2015 20:34:47 +0000 (20:34 +0000)]
Merge "Don't apply --exclude-libs for the host."
Dan Albert [Wed, 23 Sep 2015 20:32:14 +0000 (13:32 -0700)]
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
Dan Albert [Wed, 23 Sep 2015 20:15:37 +0000 (20:15 +0000)]
am
c496b259: Merge "Default to hiding libgcc symbols in each object."
* commit '
c496b259b8dddf0eac71a50f5e258da4a353d6bb':
Default to hiding libgcc symbols in each object.
Dan Albert [Wed, 23 Sep 2015 20:08:09 +0000 (20:08 +0000)]
Merge "Default to hiding libgcc symbols in each object."
Bill Yi [Wed, 23 Sep 2015 19:38:58 +0000 (12:38 -0700)]
Restore AOSP-style version numbers - DO NOT MERGE
Change-Id: Icc9bc2c03d47e1c02d3b535719862e55a9f9b7cd
Ying Wang [Tue, 22 Sep 2015 23:50:34 +0000 (23:50 +0000)]
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.
Dan Albert [Mon, 21 Sep 2015 23:36:41 +0000 (16:36 -0700)]
Default to hiding libgcc symbols in each object.
Bug: http://b/
24166967
Change-Id: I3dba264ae70a2e13b3edee7575139e86ef49be71
Ying Wang [Tue, 22 Sep 2015 23:44:41 +0000 (23:44 +0000)]
Merge "Use md5sum as the build.ninja filename suffix if the suffix gets too long."
Ying Wang [Tue, 22 Sep 2015 21:37:53 +0000 (14:37 -0700)]
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
Stephen Hines [Tue, 22 Sep 2015 22:06:34 +0000 (22:06 +0000)]
am
17a41e36: Merge "Add ld.mc as a requirement for core_tiny.mk as well."
* commit '
17a41e36dbe75b94bde05a1c511903ae2162aea8':
Add ld.mc as a requirement for core_tiny.mk as well.
Stephen Hines [Tue, 22 Sep 2015 22:00:34 +0000 (22:00 +0000)]
Merge "Add ld.mc as a requirement for core_tiny.mk as well."
Colin Cross [Tue, 22 Sep 2015 21:24:00 +0000 (14:24 -0700)]
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
Stephen Hines [Tue, 22 Sep 2015 19:49:39 +0000 (12:49 -0700)]
Add ld.mc as a requirement for core_tiny.mk as well.
Bug:
24171451
I missed this when I initially added ld.mc as a requirement for
core_minimal.mk. This is required for RenderScript linking on the
device.
Change-Id: Ie3ffa2454214f886c38387f45b34df2dcbebd6e6
Ying Wang [Tue, 22 Sep 2015 18:50:52 +0000 (18:50 +0000)]
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.
Ying Wang [Tue, 22 Sep 2015 18:42:49 +0000 (18:42 +0000)]
Merge "Don't build otatools.zip if we don't build the ota package."
Ying Wang [Tue, 22 Sep 2015 18:17:52 +0000 (11:17 -0700)]
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
Colin Cross [Tue, 22 Sep 2015 17:12:43 +0000 (17:12 +0000)]
am
9ff24387: Merge "Make USE_NINJA=true the default"
* commit '
9ff24387c205da60e3d7deb042530b1d0b2d881c':
Make USE_NINJA=true the default
Colin Cross [Tue, 22 Sep 2015 17:05:22 +0000 (17:05 +0000)]
Merge "Make USE_NINJA=true the default"
Dan Albert [Mon, 21 Sep 2015 19:40:55 +0000 (19:40 +0000)]
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."
Dan Albert [Mon, 21 Sep 2015 19:20:24 +0000 (19:20 +0000)]
Merge "Revert "Don't re-export libgcc symbols from every object.""
Dan Albert [Mon, 21 Sep 2015 19:19:02 +0000 (19:19 +0000)]
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
e92d25f296af266ebf15bafcc599a91f1f87bd38.
Change-Id: Ibd90c0fccb1fe7446f959c937963d1aa4e43c37c
Dan Albert [Mon, 21 Sep 2015 17:34:25 +0000 (17:34 +0000)]
am
86e1aa1a: Merge "Move python-adb to development/python-packages."
* commit '
86e1aa1a1d3593861f3a127e337fbdb8d965ee4f':
Move python-adb to development/python-packages.
Dan Albert [Mon, 21 Sep 2015 17:26:15 +0000 (17:26 +0000)]
Merge "Move python-adb to development/python-packages."
Ying Wang [Sun, 20 Sep 2015 03:41:43 +0000 (03:41 +0000)]
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.
Ying Wang [Sun, 20 Sep 2015 03:22:07 +0000 (03:22 +0000)]
Merge "Don't add build number to apps' version name for platform build."
Colin Cross [Sat, 19 Sep 2015 19:52:44 +0000 (19:52 +0000)]
am
0881ce18: Merge changes Ic1be7572,Id6481430
* commit '
0881ce1817395d62d2746a14350767bf411f89d4':
Pass --ninja to makeparallel for ninja
makeparallel: improve support for wrapping ninja
Christopher Ferris [Sat, 19 Sep 2015 19:52:16 +0000 (19:52 +0000)]
am
9bc462c1: Merge "Add the common directory back to kernel headers."
* commit '
9bc462c12a5c4519b00e988b738c029c688c12d5':
Add the common directory back to kernel headers.
Ying Wang [Sat, 19 Sep 2015 17:56:35 +0000 (10:56 -0700)]
Don't add build number to apps' version name for platform build.
Bug:
24201956
Change-Id: I4a4bb483bb7b1bf7b7a856050d548bee4db0fe93
Colin Cross [Fri, 18 Sep 2015 23:33:59 +0000 (23:33 +0000)]
Merge changes Ic1be7572,Id6481430
* changes:
Pass --ninja to makeparallel for ninja
makeparallel: improve support for wrapping ninja
Colin Cross [Fri, 18 Sep 2015 22:09:06 +0000 (15:09 -0700)]
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
Colin Cross [Fri, 18 Sep 2015 21:54:40 +0000 (14:54 -0700)]
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
Colin Cross [Fri, 18 Sep 2015 21:50:26 +0000 (14:50 -0700)]
makeparallel: improve support for wrapping ninja
Allow makeparallel to pass better -j and -k arguments to ninja if the
first argument to makeparallel is --ninja. Uses getopt to parse
MAKEFLAGS to get values for --jobserver-fds, -k, and -j, and uses the
result to not pass any -j argument to ninja for make -j with no number,
and pass -k0 to ninja for make -k.
Also improve the test makefile to provide many more tests.
Bug:
24199503
Change-Id: Id6481430f77e9e952213be58a98fe78c46ee5d6a
Christopher Ferris [Fri, 18 Sep 2015 20:44:58 +0000 (20:44 +0000)]
Merge "Add the common directory back to kernel headers."
Dan Albert [Fri, 18 Sep 2015 20:23:56 +0000 (13:23 -0700)]
Move python-adb to development/python-packages.
Nothing else was being imported from system/core yet, and a path under
development makes more sense for this.
Bug: http://b/
22881740
Change-Id: Ib0beb02137805b3e382535514a2bc067b7fd1d33
Evgenii Stepanov [Fri, 18 Sep 2015 20:31:54 +0000 (20:31 +0000)]
am
908260a5: Merge "Add support of SANITIZE_TARGET=\'address coverage\' for fuzzing."
* commit '
908260a56631cad51196c7b197f720bc88d7f5c7':
Add support of SANITIZE_TARGET='address coverage' for fuzzing.
Evgenii Stepanov [Fri, 18 Sep 2015 20:21:54 +0000 (20:21 +0000)]
Merge "Add support of SANITIZE_TARGET='address coverage' for fuzzing."
Ivan Krasin [Fri, 18 Sep 2015 18:54:43 +0000 (11:54 -0700)]
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
Dan Albert [Fri, 18 Sep 2015 17:29:22 +0000 (17:29 +0000)]
am
000e1a97: Merge "Don\'t re-export libgcc symbols from every object."
* commit '
000e1a973ec83cb2af644ce72a46f1c026299a7d':
Don't re-export libgcc symbols from every object.
Dan Albert [Fri, 18 Sep 2015 17:21:13 +0000 (17:21 +0000)]
Merge "Don't re-export libgcc symbols from every object."
Christopher Ferris [Wed, 16 Sep 2015 18:09:04 +0000 (11:09 -0700)]
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
Dan Albert [Thu, 17 Sep 2015 22:04:54 +0000 (15:04 -0700)]
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
Scott James Remnant [Thu, 17 Sep 2015 23:15:30 +0000 (23:15 +0000)]
am
909fe8e0: Merge "build: support compiling .mm on host"
* commit '
909fe8e0f7da8db09a004ef44a90e786c81df5e4':
build: support compiling .mm on host
Scott James Remnant [Thu, 17 Sep 2015 23:11:10 +0000 (23:11 +0000)]
Merge "build: support compiling .mm on host"
Scott James Remnant [Thu, 17 Sep 2015 22:40:49 +0000 (15:40 -0700)]
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
Dan Albert [Wed, 16 Sep 2015 23:31:41 +0000 (23:31 +0000)]
am
3ee9daac: Merge "Remove WITHOUT_(HOST|TARGET)_CLANG."
* commit '
3ee9daac6a3bf8d2a9030b99f62595330f22cafa':
Remove WITHOUT_(HOST|TARGET)_CLANG.
Dan Albert [Wed, 16 Sep 2015 23:24:40 +0000 (23:24 +0000)]
Merge "Remove WITHOUT_(HOST|TARGET)_CLANG."
Ying Wang [Wed, 16 Sep 2015 23:21:04 +0000 (23:21 +0000)]
am
6fb36397: Merge "Use /ninja_build to mark ninja build."
* commit '
6fb36397e56336e08a75e7101d6d47a98a27aea1':
Use $(OUT_DIR)/ninja_build to mark ninja build.
Ying Wang [Wed, 16 Sep 2015 23:12:37 +0000 (23:12 +0000)]
Merge "Use $(OUT_DIR)/ninja_build to mark ninja build."
Dan Albert [Wed, 16 Sep 2015 22:35:39 +0000 (15:35 -0700)]
Remove WITHOUT_(HOST|TARGET)_CLANG.
This is unused.
Change-Id: Ibc461fef02c82d110718003aceffb943c930ffe6
Ying Wang [Wed, 16 Sep 2015 22:29:08 +0000 (15:29 -0700)]
Use $(OUT_DIR)/ninja_build to mark ninja build.
Bug:
23565895
Change-Id: I000e88a45278fd52096312262eacc52511f02efb
Ying Wang [Tue, 15 Sep 2015 23:10:16 +0000 (23:10 +0000)]
am
45075cf6: Merge "Generate installed-files-vendor.txt"
* commit '
45075cf623fc59930594ac27c675cd43e36975b1':
Generate installed-files-vendor.txt
Ying Wang [Tue, 15 Sep 2015 23:09:38 +0000 (23:09 +0000)]
am
6eb3d977: Merge "Remove legacy kernel build toolchain PATH setup in envsetup.sh"
* commit '
6eb3d977c5a8b7612058f1a55e648f8200de2b8f':
Remove legacy kernel build toolchain PATH setup in envsetup.sh
Ying Wang [Tue, 15 Sep 2015 21:52:13 +0000 (21:52 +0000)]
Merge "Generate installed-files-vendor.txt"
Ying Wang [Tue, 15 Sep 2015 21:22:12 +0000 (14:22 -0700)]
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
Ying Wang [Tue, 15 Sep 2015 17:04:48 +0000 (17:04 +0000)]
Merge "Remove legacy kernel build toolchain PATH setup in envsetup.sh"
Ying Wang [Tue, 15 Sep 2015 02:32:50 +0000 (19:32 -0700)]
Remove legacy kernel build toolchain PATH setup in envsetup.sh
We used to rely on envsetup.sh to set up PATH before doing kernel build.
Now we have new kernel build process.
Also the variable doesn't work any more as we don't have corresponding arm-eabi
toolchain for the latest arm-linux-androideabi toolchain.
Change-Id: I99443fdc58e94f57f4f1f7e88da6dd127f3b2fac
Dan Willemsen [Tue, 15 Sep 2015 00:35:13 +0000 (00:35 +0000)]
am
b384eb84: Merge "kati: Handle MAKECMDGOALS modifications"
* commit '
b384eb84c3bbea9630d805f5825320e7f9acc2ba':
kati: Handle MAKECMDGOALS modifications
Dan Willemsen [Tue, 15 Sep 2015 00:28:42 +0000 (00:28 +0000)]
Merge "kati: Handle MAKECMDGOALS modifications"
Colin Cross [Tue, 15 Sep 2015 00:25:06 +0000 (00:25 +0000)]
am
4ce3cea7: Merge changes I6e4f957c,Id41a2d81
* commit '
4ce3cea77065396b81a4e50283b785e9cc64788f':
Use makeparallel to propagate -j flag to ninja or kati
Implement makeparallel
Colin Cross [Tue, 15 Sep 2015 00:18:43 +0000 (00:18 +0000)]
Merge changes I6e4f957c,Id41a2d81
* changes:
Use makeparallel to propagate -j flag to ninja or kati
Implement makeparallel
Dan Willemsen [Mon, 14 Sep 2015 23:30:51 +0000 (16:30 -0700)]
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
Colin Cross [Sun, 6 Sep 2015 07:35:21 +0000 (00:35 -0700)]
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
Colin Cross [Sun, 6 Sep 2015 04:16:19 +0000 (21:16 -0700)]
Implement makeparallel
makeparallel communicates with the GNU make jobserver
(http://make.mad-scientist.net/papers/jobserver-implementation/)
in order claim all available jobs, and then passes the number of jobs
claimed to a subprocess with -j<jobs>.
Change-Id: Id41a2d81e0d835517da8ba52c818c763fc455c14
Dan Albert [Fri, 11 Sep 2015 22:14:30 +0000 (22:14 +0000)]
am
da196abf: Merge "Fix `LOCAL_CXX_STL := none` for Windows."
* commit '
da196abf10fd9a500fe223952d96cf93ed699983':
Fix `LOCAL_CXX_STL := none` for Windows.
Dan Albert [Fri, 11 Sep 2015 20:44:46 +0000 (20:44 +0000)]
Merge "Fix `LOCAL_CXX_STL := none` for Windows."
Dan Albert [Fri, 11 Sep 2015 17:57:14 +0000 (10:57 -0700)]
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
Shinichiro Hamaji [Thu, 10 Sep 2015 03:37:24 +0000 (03:37 +0000)]
am
6d20af03: Merge "Use the same build.ninja for normal make targets"
* commit '
6d20af0391569a2f7b70a6816ddaf316b15e5a70':
Use the same build.ninja for normal make targets
Shinichiro Hamaji [Thu, 10 Sep 2015 03:31:59 +0000 (03:31 +0000)]
Merge "Use the same build.ninja for normal make targets"
Dan Willemsen [Thu, 10 Sep 2015 00:53:08 +0000 (00:53 +0000)]
am
96d3c0d0: Merge "Update the build system doc"
* commit '
96d3c0d0b14e94583438d9e93f011b1b0c930e38':
Update the build system doc
Dan Willemsen [Thu, 10 Sep 2015 00:45:59 +0000 (00:45 +0000)]
Merge "Update the build system doc"
Dan Willemsen [Wed, 9 Sep 2015 23:51:09 +0000 (16:51 -0700)]
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
Dan Willemsen [Wed, 9 Sep 2015 23:25:11 +0000 (23:25 +0000)]
am
c8db47a0: Merge "Don\'t build windows modules with clang, fix flags"
* commit '
c8db47a0213aa5c204c140cb9268389b4175ae06':
Don't build windows modules with clang, fix flags
Dan Willemsen [Wed, 9 Sep 2015 23:17:47 +0000 (23:17 +0000)]
Merge "Don't build windows modules with clang, fix flags"
Dan Willemsen [Wed, 9 Sep 2015 22:45:21 +0000 (15:45 -0700)]
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
Tao Bao [Wed, 9 Sep 2015 19:39:40 +0000 (19:39 +0000)]
am
c5fe3f11: Merge "releasetools: Fix the expected total blocks."
* commit '
c5fe3f117d79ed9ddb6e77fbf211a87dc5dffed4':
releasetools: Fix the expected total blocks.
Tao Bao [Wed, 9 Sep 2015 19:29:59 +0000 (19:29 +0000)]
Merge "releasetools: Fix the expected total blocks."
Tao Bao [Wed, 9 Sep 2015 18:55:01 +0000 (11:55 -0700)]
releasetools: Fix the expected total blocks.
With the change in [1], it zeroes out extra blocks that might be read
by dm-verity. We should update the expected number of blocks that get
touched.
[1] commit
e9b619108dbe0c358ba6c14e27c92a623a7c1059.
Bug:
23786644
Change-Id: I7a7c3531e5af6bf381d3a14832e77abfa9a8efce
Dan Willemsen [Wed, 9 Sep 2015 18:19:13 +0000 (18:19 +0000)]
am
f1c09d7f: Merge "Add HOST_CROSS_OS"
* commit '
f1c09d7fbd92a08cc51950a7d35fb5f7fc564a20':
Add HOST_CROSS_OS
Dan Albert [Wed, 9 Sep 2015 18:19:11 +0000 (18:19 +0000)]
am
feb3ecaf: Merge "Fix name for NDK protobuf libraries."
* commit '
feb3ecaff02d2bddb82aae0fa3024d9b9a62169e':
Fix name for NDK protobuf libraries.
Dan Willemsen [Wed, 9 Sep 2015 18:13:21 +0000 (18:13 +0000)]
Merge "Add HOST_CROSS_OS"
Dan Albert [Wed, 9 Sep 2015 18:13:16 +0000 (18:13 +0000)]
Merge "Fix name for NDK protobuf libraries."
Dan Willemsen [Fri, 14 Aug 2015 19:59:50 +0000 (12:59 -0700)]
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
Shinichiro Hamaji [Fri, 4 Sep 2015 05:38:37 +0000 (14:38 +0900)]
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