Commit graph

453 commits

Author SHA1 Message Date
Yohann Roussel
b68c9a498d Allow control of jack used for compilation
Version of Jack used to compile a module can now be control from
a dedicated mk located in prebuilts/sdk/tools

Bug: 24564814

Change-Id: Ie8120c97e0fa10953d4d015afd27aacfac80e5b6
2015-10-14 11:32:45 +02:00
Colin Cross
27800cb109 am acf00a8c: am d98fe91a: am 6b02b76a: Merge "Fix gcc color diagnostics"
* commit 'acf00a8c1756f68729b2142db7cfea81a59765e1':
  Fix gcc color diagnostics
2015-10-03 00:56:43 +00:00
Colin Cross
d98fe91a75 am 6b02b76a: Merge "Fix gcc color diagnostics"
* commit '6b02b76ab9ebb5c21743abc5616379d19bc1c304':
  Fix gcc color diagnostics
2015-10-03 00:43:23 +00:00
Colin Cross
12adaf5cb9 Fix gcc color diagnostics
gcc color diagnostics stopped working when the flag was moved to
TARGET_GLOBAL_CFLAGS, as that gets overwritten by combo/select.mk.  Put
it back in COMMON_GLOBAL_CFLAGS, and then let the windows build filter
it out, similar to the way clang deals with unknown flags.

Change-Id: I2db221edb893d81f199494e7515d1b9282c12fae
2015-10-02 16:42:10 -07:00
Stephen Hines
774af2fcc7 am 46eac312: am ba2355c9: resolved conflicts for 9073a5d9 to stage-aosp-master
* commit '46eac3120a7b2b317984c2f8b3c0f955706334e7':
  Fix RS NDK usage so we always pull from "current" instead of NDK 8.
2015-10-01 05:43:43 +00:00
Stephen Hines
ba2355c981 resolved conflicts for 9073a5d9 to stage-aosp-master
Change-Id: I9b048cb5fe70215a67ef025e8c7ef6aad86cffb3
2015-09-30 22:32:05 -07:00
Stephen Hines
d11c18a4b0 Fix RS NDK usage so we always pull from "current" instead of NDK 8.
The 8 in this definition refers to NDK release 8, not the API level 8.
Setting it to "current" is better, since it still contains the relevant
target API level (9 in our case) for using/building our RS support APIs.

Change-Id: Ib216ea859e137643fba81c39c4b9d0077ec04455
2015-09-28 18:07:21 -07:00
Colin Cross
ee45420799 am ffd25c7f: am 84494473: am aaa9d8dc: Merge "Fix windows build"
* commit 'ffd25c7f1445df9d6b8c28ada7b2174c6827ddcf':
  Fix windows build
2015-09-26 00:28:02 +00:00
Colin Cross
8449447384 am aaa9d8dc: Merge "Fix windows build"
* commit 'aaa9d8dc0aba0446fb11238f2aa869ce0b33df2f':
  Fix windows build
2015-09-26 00:15:44 +00:00
Colin Cross
309b420d56 Fix windows build
The windows toolchain doesn't support color, only apply
-fdiagnostics-color to HOST and TARGET, not HOST_CROSS.

Change-Id: I17b999a2852b8d70b2d39a58befa10e2e32c4608
2015-09-25 17:00:14 -07:00
Colin Cross
ad9b8f7ce7 am 6edd4cca: am ba9bc4d7: am 0d97557d: Merge "Enable color output from gcc and clang"
* commit '6edd4ccad3419c336cb5198b5353390b7a292c82':
  Enable color output from gcc and clang
2015-09-25 23:28:43 +00:00
Colin Cross
ba9bc4d70f am 0d97557d: Merge "Enable color output from gcc and clang"
* commit '0d97557d3d6f56cf6dfdb7552d4f1471d56dfabe':
  Enable color output from gcc and clang
2015-09-25 23:17:02 +00:00
Colin Cross
63e3b0294f Enable color output from gcc and clang
Force gcc and clang to always output color diagnostics.  Ninja will
strip the ANSI color codes if it is not running in a terminal.

Bug: 24273983
Change-Id: Ic9252549bfacf3bbb3f4b9d20f63010fc24ac21d
2015-09-24 22:39:17 -07:00
Steve Fung
467b79fac2 am 290b6707: am f3ec8272: am fdec88c9: Merge "Generate breakpad symbols"
* commit '290b670724fd20742a258f61dc9ab798ece13bf1':
  Generate breakpad symbols
2015-09-25 00:15:00 +00:00
Steve Fung
f3ec82729a am fdec88c9: Merge "Generate breakpad symbols"
* commit 'fdec88c9726687f98448ccff7670bc843f77bf66':
  Generate breakpad symbols
2015-09-25 00:03:21 +00:00
Steve Fung
cb2e67fdb7 Generate breakpad symbols
When BREAKPAD_GENERATE_SYMBOLS is set to true, generate breakpad
symbols for binaries.

Bug: 23900817
Change-Id: I7b992d819350f4f80df5868d16f13016502dfca0
2015-09-24 16:49:40 -07:00
Dan Willemsen
1758c0c27d am 0d1d74e4: am 6ad76ef5: am 58350dee: Merge "Don\'t add CFLAGS to CPPFLAGS"
* commit '0d1d74e4e6a01c93528a3f89ae10ec3444d559a4':
  Don't add CFLAGS to CPPFLAGS
2015-09-24 04:17:38 +00:00
Dan Willemsen
6ad76ef571 am 58350dee: Merge "Don\'t add CFLAGS to CPPFLAGS"
* commit '58350dee77bbfadaea7bce9ee83555dba4963d92':
  Don't add CFLAGS to CPPFLAGS
2015-09-24 02:20:36 +00: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
Ying Wang
9094c1d0e5 am 8767ff3b: am f695144f: am 56dca5b5: Merge "Use md5sum as the build.ninja filename suffix if the suffix gets too long."
* commit '8767ff3bb83b60af32c13b8d2407b5a7d34bf235':
  Use md5sum as the build.ninja filename suffix if the suffix gets too long.
2015-09-23 00:03:48 +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
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
Dan Albert
cb8dda5a5b am d897bc6e: am 1721cbcb: am 30b32620: Merge "Revert "Don\'t re-export libgcc symbols from every object.""
* commit 'd897bc6e10c2ddf569d79b8fda17e3490a18efe3':
  Revert "Don't re-export libgcc symbols from every object."
2015-09-21 20:00:49 +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
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
Dan Albert
491897ba74 am 823a9c8c: am 5397ba55: am 000e1a97: Merge "Don\'t re-export libgcc symbols from every object."
* commit '823a9c8c47c8d940c00c9a2cb6a653dc67fb64a7':
  Don't re-export libgcc symbols from every object.
2015-09-18 17:45:55 +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
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
Dan Willemsen
7586773bc5 am 3cf749c7: am c98d9a9d: am f1c09d7f: Merge "Add HOST_CROSS_OS"
* commit '3cf749c78a7d97ed41b0a8f3ee3598738d6d543d':
  Add HOST_CROSS_OS
2015-09-09 18:37:20 +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 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
Elliott Hughes
140bd3f0f6 am f06a2d3b: am f04f391b: am 4548e7f4: Merge "Remove AndroidConfig.h."
* commit 'f06a2d3b63c56a35db89a273a80329c56713a7e3':
  Remove AndroidConfig.h.
2015-08-28 20:22:42 +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
Shinichiro Hamaji
dbdbe585f2 am 132f6dea: am b3cd0a56: am 39c7d243: Merge "Use goma when USE_GOMA=true is set"
* commit '132f6dea3e3ac3856713eb0c869ad63c9b58f953':
  Use goma when USE_GOMA=true is set
2015-08-21 03:43:47 +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
ee482fd521 Use goma when USE_GOMA=true is set
With USE_GOMA, the path to gomacc in $GOMA_DIR or $HOME/goma
will be appended to CC_WRAPPER and CXX_WRAPPER.

Note this works only with USE_NINJA. Unlike ninja, GNU make
cannot change the parallelism depending on targets. Specifying
-j500 to GNU make would mean you may run 500 local jobs in
parallel, but with -j32 goma will just slow down the build.

Change-Id: I0f571454fd2a5b525ee29b445f7ab8715927ca00
2015-08-20 14:33:44 +09:00
Dan Willemsen
bb410f4c45 am 6d65635e: am 48d95e75: am 05d97fe7: Merge "Remove legacy windows platform build support"
* commit '6d65635ef70186edae65cd7a7b56f885fbddd3bc':
  Remove legacy windows platform build support
2015-08-18 04:49:30 +00:00
Dan Willemsen
6d65635ef7 am 48d95e75: am 05d97fe7: Merge "Remove legacy windows platform build support"
* commit '48d95e752536dc7a81c141e435e8a90b7929cf02':
  Remove legacy windows platform build support
2015-08-18 04:43:06 +00:00
Dan Willemsen
1b14846717 am 48d95e75: am 05d97fe7: Merge "Remove legacy windows platform build support"
* commit '48d95e752536dc7a81c141e435e8a90b7929cf02':
  Remove legacy windows platform build support
2015-08-18 04:43:04 +00:00
Dan Willemsen
48d95e7525 am 05d97fe7: Merge "Remove legacy windows platform build support"
* commit '05d97fe723ea376edb5fe6b12535485311a32418':
  Remove legacy windows platform build support
2015-08-18 04:37:09 +00:00
Dan Willemsen
05d97fe723 Merge "Remove legacy windows platform build support" 2015-08-18 04:31:07 +00:00
Dan Willemsen
dd122b1ea2 am 014719fc: resolved conflicts for merge of 05fae7e0 to mnc-dr-dev-plus-aosp
* commit '014719fcfc240910fa216c39826b95d712468183':
  Use repeatable timestamps
2015-08-18 04:15:47 +00:00
Dan Willemsen
9cf990beec resolved conflicts for merge of 05fae7e0 to mnc-dev-plus-aosp
Change-Id: I9f0f1169839afabc7ec7e439b668798e2cd111a3
2015-08-17 20:50:48 -07:00
Dan Willemsen
014719fcfc resolved conflicts for merge of 05fae7e0 to mnc-dr-dev-plus-aosp
Change-Id: I32919ab1e3cd5f84d09180125a7294bcfa35549e
2015-08-17 20:44:29 -07:00
Dan Willemsen
05fae7e0be am e6510750: Merge "Use repeatable timestamps"
* commit 'e65107508adbea88fcc1ec51dcf28d4216365753':
  Use repeatable timestamps
2015-08-18 03:35:44 +00:00
Dan Willemsen
e65107508a Merge "Use repeatable timestamps" 2015-08-18 03:30:11 +00:00
Dan Albert
2e4fa4baf8 am cce8d98c: am 9496ef90: am c0018b04: Merge "Add BUILD(_HOST)?_FUZZ_TEST."
* commit 'cce8d98c6bd5da5a584e69c348550cde6a065b8d':
  Add BUILD(_HOST)?_FUZZ_TEST.
2015-08-17 22:55:28 +00:00