StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,911 Commits 1 Branch 0 Tags
973decf35c2592d6ab9ab5ad9e94e36cd61e0c16
Commit Graph

8452 Commits

Author SHA1 Message Date
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