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
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
Shinichiro Hamaji
ebbea4f4e8 am e711afb1: Merge "Use as a part of ninja suffix" 
* commit 'e711afb154333407fe42e8ffe36bf76448d4f80f':
  Use $(BUILD_MODULES_IN_PATHS) as a part of ninja suffix
 2015-09-07 05:44:30 +00:00
Shinichiro Hamaji
e711afb154 Merge "Use $(BUILD_MODULES_IN_PATHS) as a part of ninja suffix" 2015-09-07 05:38:24 +00:00
Dan Willemsen
1376c2f812 am f41a670d: am 76274670: Merge "Fix LOCAL_MODULE_HOST_OS" 
* commit 'f41a670d51559afb51e14890db12d85cc0a59aa2':
  Fix LOCAL_MODULE_HOST_OS
 2015-09-05 01:36:50 +00:00
Dan Willemsen
f41a670d51 am 76274670: Merge "Fix LOCAL_MODULE_HOST_OS" 
* commit '762746705c7414985dbd457481dd33d4c69adcbb':
  Fix LOCAL_MODULE_HOST_OS
 2015-09-05 01:29:56 +00:00
Shinichiro Hamaji
909e7f40ae Use $(BUILD_MODULES_IN_PATHS) as a part of ninja suffix 
So that switching between two different mmma targets won't
need regenerating ninja files.

Change-Id: Ifddd75ec49abd3ab2a54c6afbb902b0b32359db8
 2015-09-05 09:00:19 +09:00
Dan Willemsen
ed635cfc0d Fix LOCAL_MODULE_HOST_OS 
Make sure LOCAL_IS_HOST_MODULE is set before including
module_arch_supported.mk

Bug: 23566667
Change-Id: I28ef10f093407eb3a6a83574ecc3f098eb775241
 2015-09-04 15:41:38 -07:00
Ying Wang
6f2e72ec99 am cbac8789: am af72e1b3: Merge "Move part of logtags stuff back to base_rules.mk." 
* commit 'cbac87899b63bfbd9bf9f23e16b3ac2faba7d39c':
  Move part of logtags stuff back to base_rules.mk.
 2015-09-04 18:02:31 +00:00
Ying Wang
cbac87899b am af72e1b3: Merge "Move part of logtags stuff back to base_rules.mk." 
* commit 'af72e1b3e68f449c81054bc25e655016529914e1':
  Move part of logtags stuff back to base_rules.mk.
 2015-09-04 17:56:24 +00:00
Yasuhiro Matsuda
ff82e82a1e Move part of logtags stuff back to base_rules.mk. 
Otherwise event tags for non-Java modules
(e.g. logcat, libsurfaceflinger) are not generated.

BUG: 23803975
Change-Id: I6fd53fe2ca39102787fc513aa8c23f906b94f253
 2015-09-04 20:02:49 +09:00
Dan Willemsen
1205f2d953 am f18345af: am 4379e2b8: Merge "Add LOCAL_MODULE_HOST_OS" 
* commit 'f18345af74ad00d057adad89b1d154471ebf118f':
  Add LOCAL_MODULE_HOST_OS
 2015-09-04 01:39:49 +00:00
Dan Willemsen
f18345af74 am 4379e2b8: Merge "Add LOCAL_MODULE_HOST_OS" 
* commit '4379e2b8bbaf2a02777f189c758e251015eb7f76':
  Add LOCAL_MODULE_HOST_OS
 2015-09-04 01:31:22 +00:00
Dan Willemsen
859ac34064 Add LOCAL_MODULE_HOST_OS 
Instead of wrapping a host module definition in 'ifeq($(HOST_OS),...)'
in the Android.mk files, define which hosts are supported using
LOCAL_MODULE_HOST_OS.

A blank LOCAL_MODULE_HOST_OS means that linux and darwin are supported.
A non-empty LOCAL_MODULE_HOST_OS lists the supported HOST_OSs.

Change-Id: I1e342d1908cfa00aef2c39c145b4f5f81c373bc6
 2015-09-03 16:40:51 -07:00
Zach Jang
ea9ea8fafb am cf7e78cc: am 36890dac: am 9f7c3781: am 057831bc: Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev 
* commit 'cf7e78cca06b3edc17270eb3bf6715126afd98da':
  Set the Security Patch level with Oct 1 for MNC
 2015-09-03 04:23:44 +00:00
Ying Wang
08f82e9b33 am 119cec9a: am 4e2f1903: Merge "Clean up Javac a little bit." 
* commit '119cec9a4a8792d6c5efd5f126d8c8e3fd7f90d5':
  Clean up Javac a little bit.
 2015-09-02 21:29:53 +00:00
Ying Wang
119cec9a4a am 4e2f1903: Merge "Clean up Javac a little bit." 
* commit '4e2f190315759b4270ab414b9ff1e24a19521521':
  Clean up Javac a little bit.
 2015-09-02 21:18:38 +00:00
Ying Wang
4e2f190315 Merge "Clean up Javac a little bit." 2015-09-02 20:48:50 +00:00
Evgenii Stepanov
cfa73b45c2 am d259ecd1: am 617770c1: Merge "Add AddressSanitizer linker flags for x86." 
* commit 'd259ecd171ad9a7d85d0ba44669fcb62bde342ae':
  Add AddressSanitizer linker flags for x86.
 2015-09-02 20:23:26 +00:00
Evgenii Stepanov
d259ecd171 am 617770c1: Merge "Add AddressSanitizer linker flags for x86." 
* commit '617770c133330fc06070e97ce39bbf065c749c97':
  Add AddressSanitizer linker flags for x86.
 2015-09-02 20:18:12 +00:00
Ivan Krasin
b83e171c8d Add AddressSanitizer linker flags for x86. 
This is the 1/4 change required to get AddressSanitizer
for Android x86 to work.

Change-Id: I848805af34fdd32a313c991504d6014f9b97ab88
 2015-09-02 11:59:45 -07:00
Ying Wang
447d69678e Clean up Javac a little bit. 
- Added GLOBAL_JAVAC_DEBUG_FLAGS and merge it to
  PRIVATE_JAVACFLAGS/PRIVATE_JACK_FLAGS to get rid of
  PRIVATE_JAVAC_DEBUG_FLAGS/PRIVATE_JACK_DEBUG_FLAGS.
- With Java rules out of base_rules.mk we can get rid
  of java_alternative_checked_module now.

Change-Id: I1a14716c785e3d49330a75044107662ce96a9307
 2015-09-02 10:04:18 -07:00
Shinichiro Hamaji
a7216a683c am 86de0212: am e1b9123d: Merge "Set --ninja_suffix based on make/mm/mmm targets" 
* commit '86de02120dbda1a11d5ad05b55debcf05b55131e':
  Set --ninja_suffix based on make/mm/mmm targets
 2015-09-02 00:15:51 +00:00
Shinichiro Hamaji
86de02120d am e1b9123d: Merge "Set --ninja_suffix based on make/mm/mmm targets" 
* commit 'e1b9123d51f20543fd13ebd611c9c2fe92ecaf9c':
  Set --ninja_suffix based on make/mm/mmm targets
 2015-09-02 00:04:45 +00:00
Zach Jang
9f7c37811b am 057831bc: Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev 
* commit '057831bc665b15d7beda970b91b2c332dee417f0':
  Set the Security Patch level with Oct 1 for MNC
 2015-09-02 00:04:40 +00:00
Shinichiro Hamaji
bfd01872cb Set --ninja_suffix based on make/mm/mmm targets 
This fixes two issues:

- Switching make target didn't work well when the latter
  make target is not a subset of the first make target.
- Switching between m and mm/mmm forced build.ninja to be
  regenerated.

Bug: 23685536

Change-Id: I3c3550d6cca3007d166a13367d6bc22cc3feede2
 2015-09-02 07:37:39 +09:00
Tao Bao
ccad82c52e Merge "Revert "Temporarily use blockimgdiff v2 for OTA."" into mnc-dr-dev 2015-09-01 19:02:24 +00:00
Shinichiro Hamaji
fd69b5582e am 565b95fb: am ec8f9731: Merge "Show error message when resource limit too low for USE_GOMA=true" 
* commit '565b95fbb8363652955ef3ecdd1bf122c3f0afbd':
  Show error message when resource limit too low for USE_GOMA=true
 2015-09-01 16:43:50 +00:00
Dan Willemsen
99713d6935 am 883897ec: am d0ae4796: Merge "Blacklist libc++ from windows host builds" 
* commit '883897ec16ba0ce2adbae5a82ceb75279f67e765':
  Blacklist libc++ from windows host builds
 2015-09-01 16:43:49 +00:00
Ying Wang
3ead0a7b57 am 9bf62742: resolved conflicts for merge of a15ae216 to stage-aosp-master 
* commit '9bf627422c33102b4a06eebf5d1884490faae8c7':
  Move Java stuff out of base_rules.mk
 2015-09-01 16:43:46 +00:00
Shinichiro Hamaji
565b95fbb8 am ec8f9731: Merge "Show error message when resource limit too low for USE_GOMA=true" 
* commit 'ec8f973147c3eacb048dd486c9534562f0328303':
  Show error message when resource limit too low for USE_GOMA=true
 2015-09-01 16:37:44 +00:00
Dan Willemsen
883897ec16 am d0ae4796: Merge "Blacklist libc++ from windows host builds" 
* commit 'd0ae4796a10b9855a738c5f5c79e603cac30cb9f':
  Blacklist libc++ from windows host builds
 2015-09-01 16:37:42 +00:00
Ying Wang
9bf627422c resolved conflicts for merge of a15ae216 to stage-aosp-master 
Change-Id: I9c10cf2d10f4295d12edd490ff0f9482c1810bf8
 2015-09-01 09:31:56 -07:00
Shinichiro Hamaji
ec8f973147 Merge "Show error message when resource limit too low for USE_GOMA=true" 2015-09-01 02:26:15 +00:00
Dan Willemsen
d0ae4796a1 Merge "Blacklist libc++ from windows host builds" 2015-09-01 00:44:21 +00:00
Zach Jang
4d034675f0 Set the Security Patch level with Oct 1 for MNC 
- MNC currently has security patches from the August OEM bulletin with patch date of Sep 1 plus only critical fixes from September OEM bulletin
- To be cherry-picked if picking up remaining fixes from September OEM bulletin to MNC

Change-Id: I2d1ba9c5a893727962f3f1837df1dd9df49e44f5
 2015-08-31 10:12:17 -07:00
Ying Wang
3351178fb8 Cleaned the outdated incrementaljavac. 
Nobody is using this feature and now we switched to jack.

Change-Id: I749b486eb347cbf3ee7b107565fc800eeb238c44
(cherry-picked from commit 90598cb70c)
 2015-08-29 11:08:02 -07:00
Shinichiro Hamaji
b601d4b0e4 Show error message when resource limit too low for USE_GOMA=true 
This should be particularly helpful for Mac users, because the
default limits of Mac are too low.

Change-Id: I03f0f76a0707b4ce5ef9cddf5df6e3857a215996
 2015-08-29 12:01:51 +09:00
Ying Wang
956dcccf76 Move Java stuff out of base_rules.mk 
- Moved the target-only .aidl and .logtag rules to java.mk.
- Moved the .proto rules,  Java library dependency calculation,
  Java resource processing and Java-related
  target-specific and global variables setup to a new java_common.java,
  which is shared by both target and host Java modules.
- Minor cleanup for the moved code.

Bug: 23597357
Change-Id: Ic3eb72e26bb1a663e5739abe0a935f96b88bc352
 2015-08-28 17:17:19 -07:00
Elliott Hughes
f06a2d3b63 am f04f391b: am 4548e7f4: Merge "Remove AndroidConfig.h." 
* commit 'f04f391b5f036563f71aa0c1805dc86c09137e98':
  Remove AndroidConfig.h.
 2015-08-28 20:07:13 +00:00
Elliott Hughes
f04f391b5f am 4548e7f4: Merge "Remove AndroidConfig.h." 
* commit '4548e7f49dbec05c8b8187b0ea9e746fc47ec5d3':
  Remove AndroidConfig.h.
 2015-08-28 19:59:18 +00:00
Elliott Hughes
43146118aa Remove AndroidConfig.h. 
This change leaves soong references.

Change-Id: Iee32b6b97ad9711f69e999c9d01f01d71562b63f
 2015-08-28 10:31:28 -07:00
Dan Willemsen
c222a10d06 am d1746299: am 57ff23b0: Merge "Add support for LOCAL_SRC_FILES_(host)_(arch)" 
* commit 'd174629951530d183015d7f124c993dac9da46aa':
  Add support for LOCAL_SRC_FILES_(host)_(arch)
 2015-08-28 03:55:06 +00:00
Dan Willemsen
00cf9d5008 am 399c59f3: am d5deac8d: Merge "Add _(darwin|linux|windows)" 
* commit '399c59f3aa3b7f025a8ec5b0b60af402f9954142':
  Add _(darwin|linux|windows)
 2015-08-28 03:55:05 +00:00
Dan Willemsen
d174629951 am 57ff23b0: Merge "Add support for LOCAL_SRC_FILES_(host)_(arch)" 
* commit '57ff23b0ed02affce494d14d8a0f5e9e4717baf7':
  Add support for LOCAL_SRC_FILES_(host)_(arch)
 2015-08-28 03:49:02 +00:00
Dan Willemsen
399c59f3aa am d5deac8d: Merge "Add _(darwin|linux|windows)" 
* commit 'd5deac8db951ec0a1c9edd806ea1758b836f8c46':
  Add _(darwin|linux|windows)
 2015-08-28 03:49:01 +00:00
Dan Willemsen
85ac8d2a00 Add support for LOCAL_SRC_FILES_(host)_(arch) 
For boringssl, which has architecture specific host assembly files

Bug: 23566667

Change-Id: Ia4602d28e93a1b3d1400cf95417b5e446c5fb84b
 2015-08-28 03:38:43 +00:00
Dan Willemsen
7a5498568f Add _(darwin|linux|windows) 
So that we can support building both linux and windows binaries at the
same time on a linux host. This replaces the ifeq($(HOST_OS),...) checks
in Android.mk files.

Bug: 23566667

Change-Id: I693e11984e36d55bb6f09fa0d49bc485463e16fb
 2015-08-28 03:36:22 +00:00
Ying Wang
d0cc11e898 am 8f7c08ed: am 1e120181: am 473b6a5f: am fc028e59: Dist the otatools package. 
* commit '8f7c08ed622d733c0997324d5b0464ba7e57c1fa':
  Dist the otatools package.
 2015-08-27 01:37:53 +00:00
Ying Wang
8f7c08ed62 am 1e120181: am 473b6a5f: am fc028e59: Dist the otatools package. 
* commit '1e120181f0a9240eca61dface4fb4530bf2594ab':
  Dist the otatools package.
 2015-08-27 01:27:37 +00:00
Tao Bao
7540c08807 Revert "Temporarily use blockimgdiff v2 for OTA." 
This reverts commit d07bfc5196.

Real fixes [1][2][3] are ready to merge. Time to revert the workaround.

[1] commit d47d8e1488
[2] commit 1fc67631ee
[3] commit 937847ae49

Bug: 22430577
Change-Id: Icd6623e8717c93ad1f12cd1ba43db5e006e928ad
 2015-08-26 15:29:00 -07:00
Ying Wang
1e120181f0 am 473b6a5f: am fc028e59: Dist the otatools package. 
* commit '473b6a5f2b00f941acb08b5c3df59cbbdf647609':
  Dist the otatools package.
 2015-08-26 20:17:16 +00:00
Bart Sears
b0eed1a70e am e23a407b: am 8239d21b: am 8a1fa158: am c69aa42b: Merge "Set the Security Patch level for MNC" into mnc-dev 
* commit 'e23a407b2d3153268b81a89d5755d23eb8a483b4':
  Set the Security Patch level for MNC
 2015-08-26 04:07:19 +00:00
Bart Sears
8a1fa15844 am c69aa42b: Merge "Set the Security Patch level for MNC" into mnc-dev 
* commit 'c69aa42b4331569814d23336412e6754a0495d65':
  Set the Security Patch level for MNC
 2015-08-26 03:49:10 +00:00
Bart Sears
4535d7cb34 am c69aa42b: Merge "Set the Security Patch level for MNC" into mnc-dev 
* commit 'c69aa42b4331569814d23336412e6754a0495d65':
  Set the Security Patch level for MNC
 2015-08-26 03:47:52 +00:00
Ying Wang
473b6a5f2b am fc028e59: Dist the otatools package. 
* commit 'fc028e59c2bc36297f23cdf2ee4fe9b1b60aa1cd':
  Dist the otatools package.
 2015-08-25 18:21:13 +00:00
Ying Wang
fc028e59c2 Dist the otatools package. 
Bug: 23495952

(cherry picked from commit 267e957373)

Change-Id: I49fcb9fed599268a9d37de7b14280eeb65c34788
 2015-08-25 11:13:56 -07:00
Ying Wang
419514bab2 am cf129c53: am a7eaf450: Merge "Dist the otatools package." 
* commit 'cf129c538266cdc5d185a945218e7f76aa22ca27':
  Dist the otatools package.
 2015-08-25 17:27:36 +00:00
Ying Wang
c9343c0bc3 am cf129c53: am a7eaf450: Merge "Dist the otatools package." 
* commit 'cf129c538266cdc5d185a945218e7f76aa22ca27':
  Dist the otatools package.
 2015-08-25 17:27:26 +00:00
Ying Wang
cf129c5382 am a7eaf450: Merge "Dist the otatools package." 
* commit 'a7eaf450781483791b02241fd6ab62767d4d6f99':
  Dist the otatools package.
 2015-08-25 17:21:57 +00:00
Bart Sears
0bb3145b56 Set the Security Patch level for MNC 
MNC will include the security patches from the August OEM bulletin
which will have a patch date of September 1.

Bug: 23288951
Change-Id: Ia0f313bf35fa7af1efed1787006bfbb614bc8c29
 2015-08-24 23:22:20 -07:00
Doug Zongker
2bcfbe7e88 am 32bf3f32: add otatools-package target 
* commit '32bf3f32651ddff9ffa2168017d71ec4b151a0a9':
  add otatools-package target
 2015-08-25 01:20:34 +00:00
Ying Wang
267e957373 Dist the otatools package. 
Bug: 23495952
Change-Id: I1f61946580dd8ea29c3d5e1f4e859cc6d1f8554a
 2015-08-24 17:13:53 -07:00
Tom Cherry
7958b8b6b6 am 2899727f: am bcbd4eb9: Merge "remove TARGET_PROVIDES_INIT_RC" 
* commit '2899727fd7c97729df11c59a4ebf76df73379a28':
  remove TARGET_PROVIDES_INIT_RC
 2015-08-24 23:35:25 +00:00
Tom Cherry
00c9b1b323 am 2899727f: am bcbd4eb9: Merge "remove TARGET_PROVIDES_INIT_RC" 
* commit '2899727fd7c97729df11c59a4ebf76df73379a28':
  remove TARGET_PROVIDES_INIT_RC
 2015-08-24 23:35:17 +00:00
Tom Cherry
2899727fd7 am bcbd4eb9: Merge "remove TARGET_PROVIDES_INIT_RC" 
* commit 'bcbd4eb9fb9c82f35ca46cc9b976a59b6c1645d4':
  remove TARGET_PROVIDES_INIT_RC
 2015-08-24 23:28:34 +00:00
Doug Zongker
32bf3f3265 add otatools-package target 
Add a target to zip up all the otatools and releasetools, for easy
copying to the OTA builder machine.

Change-Id: I55a6d93c1de75ac936d941c0e3ae72897407f563
(cherry picked from commit f22b0f43ef)
 2015-08-24 15:43:40 -07:00
Tom Cherry
2df35aea43 remove TARGET_PROVIDES_INIT_RC 
Change-Id: I765b80d48333f54fb995e4ccfd77d38683c6cbb9
 2015-08-24 13:55:02 -07:00
Christopher Wiley
597a65cad0 am 2b2c9dff: am 4e719eaf: Merge "Change .dbus.xml extension to .dbus-xml" 
* commit '2b2c9dff35304c21ebe1e793a16443a882920f75':
  Change .dbus.xml extension to .dbus-xml
 2015-08-21 22:25:31 +00:00
Christopher Wiley
3f7c5424db am 2b2c9dff: am 4e719eaf: Merge "Change .dbus.xml extension to .dbus-xml" 
* commit '2b2c9dff35304c21ebe1e793a16443a882920f75':
  Change .dbus.xml extension to .dbus-xml
 2015-08-21 22:24:31 +00:00
Christopher Wiley
2b2c9dff35 am 4e719eaf: Merge "Change .dbus.xml extension to .dbus-xml" 
* commit '4e719eafc4d183dd923518cea6292f37ee1e26c6':
  Change .dbus.xml extension to .dbus-xml
 2015-08-21 20:51:11 +00:00
Christopher Wiley
4e719eafc4 Merge "Change .dbus.xml extension to .dbus-xml" 2015-08-21 20:46:21 +00:00
Shinichiro Hamaji
8a0607f069 am b3cd0a56: am 39c7d243: Merge "Use goma when USE_GOMA=true is set" 
* commit 'b3cd0a566391726a69d9f0e439268f4caf5df7db':
  Use goma when USE_GOMA=true is set
 2015-08-21 03:36:12 +00:00
Shinichiro Hamaji
132f6dea3e am b3cd0a56: am 39c7d243: Merge "Use goma when USE_GOMA=true is set" 
* commit 'b3cd0a566391726a69d9f0e439268f4caf5df7db':
  Use goma when USE_GOMA=true is set
 2015-08-21 03:36:07 +00:00
Shinichiro Hamaji
b3cd0a5663 am 39c7d243: Merge "Use goma when USE_GOMA=true is set" 
* commit '39c7d243395ad3f2015571aaf902dc4d4686e981':
  Use goma when USE_GOMA=true is set
 2015-08-21 03:29:49 +00:00
Shinichiro Hamaji
39c7d24339 Merge "Use goma when USE_GOMA=true is set" 2015-08-21 03:24:27 +00:00
Elliott Hughes
7ffa77e8e7 am 344c3394: am 6f534125: Merge "Fix Linux host checkbuilds." 
* commit '344c33949b48ec5f3d27bff36f145f157156cf19':
  Fix Linux host checkbuilds.
 2015-08-21 00:12:19 +00:00
Elliott Hughes
dc289ce17c am 344c3394: am 6f534125: Merge "Fix Linux host checkbuilds." 
* commit '344c33949b48ec5f3d27bff36f145f157156cf19':
  Fix Linux host checkbuilds.
 2015-08-21 00:11:53 +00:00
Elliott Hughes
344c33949b am 6f534125: Merge "Fix Linux host checkbuilds." 
* commit '6f5341259c6b6684acb4e91d9220593c231abecd':
  Fix Linux host checkbuilds.
 2015-08-21 00:05:12 +00:00
Elliott Hughes
6f5341259c Merge "Fix Linux host checkbuilds." 2015-08-20 23:56:07 +00:00
Elliott Hughes
ac9eea9463 Fix Linux host checkbuilds. 
Turns out that thanks to 9d59f41776 we actually
build *all* the host libraries both 32- and 64-bit. Rather than fix the
libraries (or fixing things so we don't build stuff we don't need) right now,
let's just put _FILE_OFFSET_BITS and _LARGEFILE_SOURCE back.

Change-Id: I6c2d6a6919d1518f775e0d6c050e2c774994c5bd
 2015-08-20 16:52:47 -07:00
Elliott Hughes
64154b258b am 30a18bca: am a3fa59b1: Merge "Kill host Linux AndroidConfig.h." 
* commit '30a18bca6222065d15e1b18d71a29a8fb921d4a8':
  Kill host Linux AndroidConfig.h.
 2015-08-20 23:21:15 +00:00
Elliott Hughes
158800c9ed am 30a18bca: am a3fa59b1: Merge "Kill host Linux AndroidConfig.h." 
* commit '30a18bca6222065d15e1b18d71a29a8fb921d4a8':
  Kill host Linux AndroidConfig.h.
 2015-08-20 23:20:21 +00:00
Elliott Hughes
30a18bca62 am a3fa59b1: Merge "Kill host Linux AndroidConfig.h." 
* commit 'a3fa59b12b7346b3d0fbb8c60f890e50c7f51f18':
  Kill host Linux AndroidConfig.h.
 2015-08-20 23:14:41 +00:00
Elliott Hughes
a3fa59b12b Merge "Kill host Linux AndroidConfig.h." 2015-08-20 23:10:05 +00:00
Elliott Hughes
1ceef60a68 am 00da9ced: am ded991b4: Merge "Revert "Fix Windows SDK build."" 
* commit '00da9cede0b4199d3b6dea73b61afa8610b5c339':
  Revert "Fix Windows SDK build."
 2015-08-20 21:55:04 +00:00
Elliott Hughes
b4ec57c016 am 00da9ced: am ded991b4: Merge "Revert "Fix Windows SDK build."" 
* commit '00da9cede0b4199d3b6dea73b61afa8610b5c339':
  Revert "Fix Windows SDK build."
 2015-08-20 21:54:58 +00:00
Elliott Hughes
1dc63f720c am 0049aecf: am a6065996: Merge "Stop defining WIN32." 
* commit '0049aecf1763ea939cdf91e4e70fda67eb2efbee':
  Stop defining WIN32.
 2015-08-20 21:54:57 +00:00
Elliott Hughes
7f45f953ad am 0049aecf: am a6065996: Merge "Stop defining WIN32." 
* commit '0049aecf1763ea939cdf91e4e70fda67eb2efbee':
  Stop defining WIN32.
 2015-08-20 21:54:57 +00:00
Elliott Hughes
00da9cede0 am ded991b4: Merge "Revert "Fix Windows SDK build."" 
* commit 'ded991b47d0235bd505b5d95e438118d0b7f1041':
  Revert "Fix Windows SDK build."
 2015-08-20 21:43:17 +00:00
Elliott Hughes
0049aecf17 am a6065996: Merge "Stop defining WIN32." 
* commit 'a6065996cd280acf11f199c1f90e1b8886635207':
  Stop defining WIN32.
 2015-08-20 21:43:16 +00:00
Elliott Hughes
ded991b47d Merge "Revert "Fix Windows SDK build."" 2015-08-20 21:23:59 +00:00
Elliott Hughes
73042ea0c7 Revert "Fix Windows SDK build." 
This reverts commit b8dd176441.

This wasn't the problem, and mingw doesn't even use _LARGEFILE_SOURCE. The real problem (using WIN32 instead of _WIN32 in external/llvm) is fixed now.

Change-Id: I2b708a006b530cb18d03b1425cd65edda35ee17e
 2015-08-20 21:22:19 +00:00
Elliott Hughes
a6065996cd Merge "Stop defining WIN32." 2015-08-20 21:21:01 +00:00
Elliott Hughes
f0c04c7b2e Stop defining WIN32. 
Change-Id: Iac0b4745579e6de55bea02571617ae561308e1a9
 2015-08-20 14:04:18 -07:00
Ying Wang
7e3ba1b7a7 am 8a3241e3: am 11a38e7a: Merge "Support LOCAL_INIT_RC." 
* commit '8a3241e39ad541666aeff291b088e7277b5519ca':
  Support LOCAL_INIT_RC.
 2015-08-20 21:00:14 +00:00
Ying Wang
4270d91bbe am 8a3241e3: am 11a38e7a: Merge "Support LOCAL_INIT_RC." 
* commit '8a3241e39ad541666aeff291b088e7277b5519ca':
  Support LOCAL_INIT_RC.
 2015-08-20 21:00:07 +00:00
Ying Wang
8a3241e39a am 11a38e7a: Merge "Support LOCAL_INIT_RC." 
* commit '11a38e7a9164bc3268344ce716c4bd12b08cb05c':
  Support LOCAL_INIT_RC.
 2015-08-20 20:53:32 +00:00
Ying Wang
11a38e7a91 Merge "Support LOCAL_INIT_RC." 2015-08-20 20:47:53 +00:00
Elliott Hughes
59b3bd27a0 am 896d0ee2: am 999fd4ea: Merge "Also -DWIN32 to keep llvm building." 
* commit '896d0ee2cf123f045af859d7291dba65a0b7d789':
  Also -DWIN32 to keep llvm building.
 2015-08-20 19:32:39 +00:00
Elliott Hughes
29e8a32972 am 9f9d2aed: am 79b199b8: Merge "Fix Windows SDK build." 
* commit '9f9d2aedf4e28f0dec1568347ac6a052cdca12b9':
  Fix Windows SDK build.
 2015-08-20 19:32:34 +00:00
Elliott Hughes
a65473b0e7 am 896b9c60: am 57069e59: Merge "Remove Windows AndroidConfig.h." 
* commit '896b9c603938220ea40f75a07aef8ec1a0664f37':
  Remove Windows AndroidConfig.h.
 2015-08-20 19:32:30 +00:00