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

8323 Commits

Author SHA1 Message Date
Shinichiro Hamaji
d5b9dfa519 am 412e7ee1: am 6b37c7b3: Merge "Allow USE_GOMA=true without explicit USE_NINJA=true" 
* commit '412e7ee1f9370b35c68f982e922e6f5e7bd38190':
  Allow USE_GOMA=true without explicit USE_NINJA=true
 2015-09-25 04:34:36 +00:00
Shinichiro Hamaji
412e7ee1f9 am 6b37c7b3: Merge "Allow USE_GOMA=true without explicit USE_NINJA=true" 
* commit '6b37c7b32af667f6a42b397a27add34d3c59e5fa':
  Allow USE_GOMA=true without explicit USE_NINJA=true
 2015-09-25 04:28:50 +00:00
Shinichiro Hamaji
6b37c7b32a Merge "Allow USE_GOMA=true without explicit USE_NINJA=true" 2015-09-25 04:23:28 +00:00
Colin Cross
ede3d2e856 am 45b0c8f1: am c180dd0b: Merge "Revert "disable Krait for Mac builds to avoid assembler issues"" 
* commit '45b0c8f1633ea7762e5bd9517d89cb716e09beb4':
  Revert "disable Krait for Mac builds to avoid assembler issues"
 2015-09-25 01:20:29 +00:00
Colin Cross
45b0c8f163 am c180dd0b: Merge "Revert "disable Krait for Mac builds to avoid assembler issues"" 
* commit 'c180dd0bfc55ae222f143dc86a333caf000cbf03':
  Revert "disable Krait for Mac builds to avoid assembler issues"
 2015-09-25 01:11:48 +00:00
Colin Cross
c180dd0bfc Merge "Revert "disable Krait for Mac builds to avoid assembler issues"" 2015-09-25 01:07:52 +00:00
Colin Cross
737cc70b50 Revert "disable Krait for Mac builds to avoid assembler issues" 
This doesn't seem to be a problem any more, and mac builds
that differ from linux builds is causing other problems.

This reverts commit 7c40fb95dc.

Bug: 24339250
Change-Id: I8a0da11df42d58ba9c3ded4571f1db870f400a21
 2015-09-25 00:30:34 +00:00
Steve Fung
290b670724 am f3ec8272: am fdec88c9: Merge "Generate breakpad symbols" 
* commit 'f3ec82729a0543a1bccaac08087b8c9c0556fc64':
  Generate breakpad symbols
 2015-09-25 00:08:04 +00:00
Ying Wang
34a38f2c6c am 945bc2f2: am 92facb1f: Merge "Substitue "/" with "-" in the MODULES-IN phony goal names." 
* commit '945bc2f28865935125a465f1480e4fbc39a54b99':
  Substitue "/" with "-" in the MODULES-IN phony goal names.
 2015-09-25 00:08:03 +00:00
Steve Fung
f3ec82729a am fdec88c9: Merge "Generate breakpad symbols" 
* commit 'fdec88c9726687f98448ccff7670bc843f77bf66':
  Generate breakpad symbols
 2015-09-25 00:03:21 +00:00
Ying Wang
945bc2f288 am 92facb1f: Merge "Substitue "/" with "-" in the MODULES-IN phony goal names." 
* commit '92facb1fed26492746aca267df51b6082286521c':
  Substitue "/" with "-" in the MODULES-IN phony goal names.
 2015-09-24 23:59:29 +00:00
Steve Fung
fdec88c972 Merge "Generate breakpad symbols" 2015-09-24 23:57:42 +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
Ying Wang
61cd884a11 Substitue "/" with "-" in the MODULES-IN phony goal names. 
This avoids Ninja's path canonicalization on those goal names.
Without this, Ninja complains about duplicate rules for
MODULES-IN/a/b/.. and MODULES-IN/a.

Bug: 24309760
Change-Id: Id3aa9da5d3887a2cd1426cbb5fdf35659c65805e
 2015-09-24 16:24:42 -07:00
Elliott Hughes
4f74c05f88 am b101f73b: am 43bbbf8a: Merge "Remove more of the pathmap." 
* commit 'b101f73be95aade6719d1d92c8afbb3df8a0d4c9':
  Remove more of the pathmap.
 2015-09-24 22:05:42 +00:00
Elliott Hughes
b101f73be9 am 43bbbf8a: Merge "Remove more of the pathmap." 
* commit '43bbbf8a15cfc03ce99d0b6a49992b25cf51fc39':
  Remove more of the pathmap.
 2015-09-24 21:59:58 +00:00
Elliott Hughes
43bbbf8a15 Merge "Remove more of the pathmap." 2015-09-24 21:50:42 +00:00
Dan Albert
e9d7906db9 am cc66e98e: am 880f05f4: Merge "Use exported includes for libc++." 
* commit 'cc66e98e798a3cfd0cde78423efde4f26fb3e72c':
  Use exported includes for libc++.
 2015-09-24 21:48:56 +00:00
Dan Willemsen
d898312e3a am af6d2d87: am aeaa0f5c: Merge "Turn shared library multilib warnings into errors" 
* commit 'af6d2d8754b4c125e414d85a36705da4b2fd74f4':
  Turn shared library multilib warnings into errors
 2015-09-24 21:48:55 +00:00
Dan Albert
cc66e98e79 am 880f05f4: Merge "Use exported includes for libc++." 
* commit '880f05f4f28df672eb4ff4ce6b7735480deb13ae':
  Use exported includes for libc++.
 2015-09-24 21:43:54 +00:00
Dan Willemsen
af6d2d8754 am aeaa0f5c: Merge "Turn shared library multilib warnings into errors" 
* commit 'aeaa0f5c580356c0d74dd11e00fb29ae67d97f2b':
  Turn shared library multilib warnings into errors
 2015-09-24 21:38:46 +00:00
Dan Albert
880f05f4f2 Merge "Use exported includes for libc++." 2015-09-24 21:38:21 +00:00
Dan Albert
eb3e3fa5da Use exported includes for libc++. 
Change-Id: Ia5d9c857a43975448a8c2b489cc29be0fa67ddf6
 2015-09-24 14:09:09 -07:00
Christopher Ferris
561b4c1995 Set mcpu targets based on cpu variant. 
Make cortex-a53 and cortex-a53.a57 use cortex-a7.

Change-Id: I89d5b3f044c867ec99aae319eafc33f2edf1f9f2
 2015-09-24 13:59:33 -07:00
Dan Willemsen
7cc88b794d Turn shared library multilib warnings into errors 
When caught later, these just get turned into warnings with
unpredictable results, or non-obvious errors.

Change-Id: Ie7ba88e97dc5bedd6cf850748d79693711ac41da
 2015-09-24 13:21:11 -07:00
Ying Wang
0c538471d1 am 34f7562e: am 3f107055: Merge "The pattern %tests is too broad." 
* commit '34f7562e8625d66de3f43396d4cfdd327d1ac2e5':
  The pattern %tests is too broad.
 2015-09-24 18:53:34 +00:00
Ying Wang
34f7562e86 am 3f107055: Merge "The pattern %tests is too broad." 
* commit '3f10705579deae60d9b903a4587a66a26112ee4a':
  The pattern %tests is too broad.
 2015-09-24 18:45:23 +00:00
Ying Wang
ce2843f455 The pattern %tests is too broad. 
We had fixed the filtering of %tests in art/Android.mk.
Actually the %tests leads to false build<suffix>.ninja when you run:
$ mmma cts/tests/tests/nativeopengl/libnativeopengltests
because the new mmma calls make with goals like
MODULES-IN/cts/tests/tests/nativeopengl/libnativeopengltests .

Bug: 24309760
Change-Id: I35af2e8d046ae40f3b90ec0a92473fcab8ff5db5
 2015-09-24 11:34:46 -07:00
Elliott Hughes
09c255dbd1 Remove more of the pathmap. 
I've fixed libpagemap to export its headers, the only user of the
libnativehelper entry was in this file anyway, and no one was using
the libhost entry.

Change-Id: Id0d1773e55c0114ccc56cefd783689193a6204f9
 2015-09-24 09:02:19 -07:00
Shinichiro Hamaji
c1cba69970 Make it possible to change the number of remote jobs 
User can overwrite NINJA_REMOTE_NUM_JOBS for this purpose. The
number is passed to ninja instead of to kati so no we don't
need to regenerate a ninja file when a user changes this value.

Change-Id: I2ccfaaae4492d84a8b8045dff612cb5f6ebe2c79
 2015-09-24 16:22:44 +09:00
Shinichiro Hamaji
d8f268ecac Allow USE_GOMA=true without explicit USE_NINJA=true 
Now ninja build is disabled only with USE_NINJA=false. So goma.mk
should fail with an error only when USE_NINJA=false is explicitly
specified.

Change-Id: I2fb913433d5c1e93ed2a9bd93bb5000cabd835a4
 2015-09-24 15:19:08 +09:00
Ying Wang
feca5313b7 am 2f9f1fb3: resolved conflicts for 964f06b1 to stage-aosp-master 
* commit '2f9f1fb32f8e2320cbb515c82a3b471da4b6e848':
  Re-implement mma/mmma using make goals.
 2015-09-24 02:37:49 +00:00
Ying Wang
2f9f1fb32f resolved conflicts for 964f06b1 to stage-aosp-master 
Change-Id: I0cebad2e440ec7d605afafac893352f06ca2f419
 2015-09-23 19:31:44 -07:00
Dan Willemsen
418868a488 am a0af56f6: am bd1b9e33: Merge "Sort all files found via " 
* commit 'a0af56f6989d250f290257967f64f640531472f5':
  Sort all files found via $(shell find)
 2015-09-24 02:30:40 +00:00
Dan Willemsen
30dc4d2582 am 04df6551: am b6a3ede5: Merge "Remove trailing / for HOST_TOOLCHAIN_FOR_CLANG" 
* commit '04df6551922c6ebc5c40a08df9ab21b72e81a6b2':
  Remove trailing / for HOST_TOOLCHAIN_FOR_CLANG
 2015-09-24 02:30:38 +00:00
Dan Willemsen
0d1d74e4e6 am 6ad76ef5: am 58350dee: Merge "Don\'t add CFLAGS to CPPFLAGS" 
* commit '6ad76ef571d8eb1e66244f6abe010ccd76876cf0':
  Don't add CFLAGS to CPPFLAGS
 2015-09-24 02:30:37 +00:00
Dan Willemsen
a0af56f698 am bd1b9e33: Merge "Sort all files found via " 
* commit 'bd1b9e3332de46e1f08b4b5ca8f53d0a096b4793':
  Sort all files found via $(shell find)
 2015-09-24 02:20:39 +00:00
Dan Willemsen
04df655192 am b6a3ede5: Merge "Remove trailing / for HOST_TOOLCHAIN_FOR_CLANG" 
* commit 'b6a3ede5506bec89618519bf4a8adb635e570e89':
  Remove trailing / for HOST_TOOLCHAIN_FOR_CLANG
 2015-09-24 02:20: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
Ying Wang
964f06b178 Merge "Re-implement mma/mmma using make goals." 2015-09-24 01:20:05 +00:00
Dan Willemsen
bd1b9e3332 Merge "Sort all files found via $(shell find)" 2015-09-24 00:55:27 +00:00
Dan Willemsen
b6a3ede550 Merge "Remove trailing / for HOST_TOOLCHAIN_FOR_CLANG" 2015-09-24 00:42:26 +00:00
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