Commit Graph

27180 Commits

Author SHA1 Message Date
Aaron Holden aee6f602f9 Move suite-level dynamic config to testcases
Enable client-side dynamic config code to access the suite-level dynamic
config files by placing them in the testcases directory. Also update
cts_v2.mk to define the location of its corresponding dynamic config file.

bug:23625592
Change-Id: Id11dea4b6acbe8ea7e5e9579e369a2be5873a224
2015-12-16 12:32:57 -08:00
Gina Dimino 7ae8e1ea91 Merge "Docs: Replace custom search engine Bug: 25778395" am: 36412fa8f9
am: 2635974ed8

* commit '2635974ed8574eac98266365287e0fd8c7cf6f2e':
  Docs: Replace custom search engine Bug: 25778395
2015-12-16 19:38:57 +00:00
Gina Dimino 2635974ed8 Merge "Docs: Replace custom search engine Bug: 25778395"
am: 36412fa8f9

* commit '36412fa8f9cc59c3aa31988d8a38576aeae6b6bd':
  Docs: Replace custom search engine Bug: 25778395
2015-12-16 19:01:13 +00:00
Gina Dimino 36412fa8f9 Merge "Docs: Replace custom search engine Bug: 25778395" 2015-12-16 18:49:42 +00:00
Gina Dimino 8cc3a9e117 Docs: Replace custom search engine
Bug: 25778395

Change-Id: I432698f63088a3e4ec285e46c7de2295c4cefad3
2015-12-16 10:00:33 -08:00
Than McIntosh 4983fdc854 Merge "Re-enable gold linker for aarch64." am: 9d76c75782
am: 831b4bca1b

* commit '831b4bca1bf621119da7c64bb4736dd4f1b39fed':
  Re-enable gold linker for aarch64.
2015-12-16 04:14:27 -08:00
Than McIntosh 831b4bca1b Merge "Re-enable gold linker for aarch64."
am: 9d76c75782

* commit '9d76c757820701587013aa295f4482c915d4b166':
  Re-enable gold linker for aarch64.
2015-12-16 12:10:32 +00:00
Than McIntosh 9d76c75782 Merge "Re-enable gold linker for aarch64." 2015-12-16 12:02:04 +00:00
Colin Cross aa68b787c7 Merge "Tell soong that it is embedded in a make build" am: 61b771e79f
am: 17f2961cd6

* commit '17f2961cd657db074440f970ddf3d3a2b5a0fe28':
  Tell soong that it is embedded in a make build
2015-12-16 02:01:39 +00:00
Colin Cross cb16289b06 Merge "Combine soong builds into make builds" am: 3bfc560cc5
am: 17d3f5426b

* commit '17d3f5426b71a510244bdbbe5a0e7f0548692420':
  Combine soong builds into make builds
2015-12-16 02:01:26 +00:00
Colin Cross 70fd02af56 Merge "Remove unneccessary TARGET_BUILD_APPS conditional" am: e416a5f716
am: 1452e0a389

* commit '1452e0a389a24a6515bc8915076a93155f7bbced':
  Remove unneccessary TARGET_BUILD_APPS conditional
2015-12-16 02:01:19 +00:00
Colin Cross 17f2961cd6 Merge "Tell soong that it is embedded in a make build"
am: 61b771e79f

* commit '61b771e79f19f19eae62d1b7a97d105ef6222cff':
  Tell soong that it is embedded in a make build
2015-12-16 01:57:20 +00:00
Colin Cross 17d3f5426b Merge "Combine soong builds into make builds"
am: 3bfc560cc5

* commit '3bfc560cc54b58376d095aeaf22d3a74726bcec7':
  Combine soong builds into make builds
2015-12-16 01:57:07 +00:00
Colin Cross 61b771e79f Merge "Tell soong that it is embedded in a make build" 2015-12-16 01:47:14 +00:00
Dan Willemsen 5f38f9be22 Tell soong that it is embedded in a make build
So that it can munge its ninja targets to not conflict with make.

Change-Id: I0c2273c0ca2fdfced1fa1590f2ea3eac8cddb905
2015-12-16 01:47:02 +00:00
Colin Cross 3bfc560cc5 Merge "Combine soong builds into make builds" 2015-12-16 01:46:52 +00:00
Colin Cross 1452e0a389 Merge "Remove unneccessary TARGET_BUILD_APPS conditional"
am: e416a5f716

* commit 'e416a5f71638bc324a368e4c66a4834117322c7a':
  Remove unneccessary TARGET_BUILD_APPS conditional
2015-12-16 01:33:33 +00:00
Colin Cross e416a5f716 Merge "Remove unneccessary TARGET_BUILD_APPS conditional" 2015-12-16 00:56:08 +00:00
Colin Cross 3ebb2f7326 Combine soong builds into make builds
Bootstrap soong if necessary, and wrap the kati and soong ninja files
into a single ninja file.

Change-Id: I0000c7eaa1adda763189681c57ec27a97a12ee1f
2015-12-15 16:05:57 -08:00
Colin Cross 493205eee4 Remove unneccessary TARGET_BUILD_APPS conditional
The prebuilt tools no longer conflict with the tools built from source,
remove the conditional.

Change-Id: Id334e25d9cfa2d5934450dd223bc9e30cd890062
2015-12-15 15:49:53 -08:00
Ying Wang 41c469e524 Merge "Remove the prebuilt tools cleanstep logic." am: cff032ca54
am: 13a225ff9f

* commit '13a225ff9fa382ac543eba30fe70c08c4a69eeeb':
  Remove the prebuilt tools cleanstep logic.
2015-12-15 23:19:35 +00:00
Ying Wang 13a225ff9f Merge "Remove the prebuilt tools cleanstep logic."
am: cff032ca54

* commit 'cff032ca54f4dfc06f88b863d09c66040151bc36':
  Remove the prebuilt tools cleanstep logic.
2015-12-15 21:56:59 +00:00
Ying Wang cff032ca54 Merge "Remove the prebuilt tools cleanstep logic." 2015-12-15 21:45:44 +00:00
Ying Wang a79e1324a0 Remove the prebuilt tools cleanstep logic.
We switched to running prebuilt host tools in place in
prebuilts/sdk/tools in TARGET_BUILD_APPS build. This logic is no longer
needed.

Change-Id: Ibf88b3c0a09fb3a1a04b25403457c48851ecc6f4
2015-12-15 12:39:02 -08:00
Ying Wang 4106b2e4c9 Merge "Disable .toc optimization for host modules." am: 7b92312ea1
am: 8449b88b2e

* commit '8449b88b2e64f49a6858ec36acca9e877585802e':
  Disable .toc optimization for host modules.
2015-12-15 19:32:42 +00:00
Ying Wang 8449b88b2e Merge "Disable .toc optimization for host modules."
am: 7b92312ea1

* commit '7b92312ea1184fc50b230f68214fe6ae9d3f597d':
  Disable .toc optimization for host modules.
2015-12-15 19:22:37 +00:00
Ying Wang 7b92312ea1 Merge "Disable .toc optimization for host modules." 2015-12-15 18:56:39 +00:00
Ying Wang c01f2dcb10 Disable .toc optimization for host modules.
Host binaries may be run during the build process and the internal
implementation of the shared libraries makes a difference for the build
result. This change makes sure host tools get re-linked and re-run when
any of its dependency libraries gets updated.
DEX2OAT is such a host tool. We also changed DEX2OAT as full dependency
of dex-preoptimization, so we rebuild the odex files if DEX2OAT itself,
or any dependency libraries changed.

Bug: 24597504
Change-Id: Idf0d9be82ccebd826d9c5b405a39cff437e0af29
2015-12-15 10:00:19 -08:00
Shinichiro Hamaji 7034d9beae Merge "Reduce unnecessary rebuilds of .dex files with restat=1" am: 542aa57f1d
am: 0d4a0a9dd5

* commit '0d4a0a9dd5c1f3528b611862cb9fa81313028d1b':
  Reduce unnecessary rebuilds of .dex files with restat=1
2015-12-15 08:17:56 -08:00
Shinichiro Hamaji 0d4a0a9dd5 Merge "Reduce unnecessary rebuilds of .dex files with restat=1"
am: 542aa57f1d

* commit '542aa57f1d48b1a8f4afa71d6635f8ed93c82289':
  Reduce unnecessary rebuilds of .dex files with restat=1
2015-12-15 16:05:10 +00:00
Than McIntosh 2c3b926ab3 Re-enable gold linker for aarch64.
Turn back on ld.gold and W-l,--icf=safe for
aarch64, now that the prebuilt ld.gold has been updated
with support for reloc 311/312 (fixed upstream, see
https://sourceware.org/bugzilla/show_bug.cgi?id=19042)

Bug: 25642296
Bug: 26153840

Change-Id: Idceb357a48d9da4eec38ab8f2103245d500622ae
2015-12-15 09:27:19 -05:00
Nicolas Geoffray 7126594f8d Merge "Revert "Revert "Make PIC and PREOPT default for all.""" 2015-12-15 11:26:15 +00:00
Nicolas Geoffray 2ad526124c Revert "Revert "Make PIC and PREOPT default for all.""
bug:25801231

This reverts commit f2a9135ed1.

Change-Id: I2eca605212b78505667af1f7e9c83f5cca5db35a
2015-12-15 09:54:30 +00:00
Shinichiro Hamaji 542aa57f1d Merge "Reduce unnecessary rebuilds of .dex files with restat=1" 2015-12-15 06:27:31 +00:00
Elliott Hughes 6efcdc4499 Merge "Turn on stack protector for mips64." am: 6725b4b004
am: b96f6bad55

* commit 'b96f6bad55c7d4a0a2151e34e624f1b817b4aff6':
  Turn on stack protector for mips64.
2015-12-14 23:30:05 +00:00
Elliott Hughes 4ea1c2c0cc Merge "Turn on stack protector for mips." am: 391caae952
am: 0391338750

* commit '03913387507ad37e9eaaf7bcc4ec37053191bee8':
  Turn on stack protector for mips.
2015-12-14 23:29:50 +00:00
Elliott Hughes b96f6bad55 Merge "Turn on stack protector for mips64."
am: 6725b4b004

* commit '6725b4b004b45cd4cf3ed2ebdb40daf194e0b733':
  Turn on stack protector for mips64.
2015-12-14 23:13:48 +00:00
Elliott Hughes 0391338750 Merge "Turn on stack protector for mips."
am: 391caae952

* commit '391caae9528a5e7cc77763be6f456bd01325f66e':
  Turn on stack protector for mips.
2015-12-14 23:13:31 +00:00
Elliott Hughes 6725b4b004 Merge "Turn on stack protector for mips64." 2015-12-14 22:48:38 +00:00
Elliott Hughes 09ba4c870d Turn on stack protector for mips64.
Go straight to -fstack-protector-strong, since it works to boot the emulator.

Change-Id: I2b65a0ab4426856ae05f66c1e294951e45bd72b6
2015-12-14 14:46:38 -08:00
Elliott Hughes 391caae952 Merge "Turn on stack protector for mips." 2015-12-14 22:46:23 +00:00
Elliott Hughes eb396e2a51 Merge "Enable -fstack-protector-strong for x86-64." am: 02191c97ef
am: d3eae50874

* commit 'd3eae508740ef71d60844b8149544fb7b637b09a':
  Enable -fstack-protector-strong for x86-64.
2015-12-14 22:33:29 +00:00
Elliott Hughes b8cd34fca1 Merge "Be smarter about stack-protector on the host." am: 19e85a25ee
am: 39d848b1b4

* commit '39d848b1b4a00ba7bc79242f746197e39d878310':
  Be smarter about stack-protector on the host.
2015-12-14 22:33:16 +00:00
Elliott Hughes b9b89e9385 Turn on stack protector for mips.
Go straight to -fstack-protector-strong, since it works to boot the emulator.

Change-Id: Ie44abd869355d2163dec7d9e2635b26b45255df6
2015-12-14 14:15:12 -08:00
Elliott Hughes d3eae50874 Merge "Enable -fstack-protector-strong for x86-64."
am: 02191c97ef

* commit '02191c97effe88dddfd60b365a9c408861ba8870':
  Enable -fstack-protector-strong for x86-64.
2015-12-14 13:54:03 -08:00
Elliott Hughes 39d848b1b4 Merge "Be smarter about stack-protector on the host."
am: 19e85a25ee

* commit '19e85a25eefe5fbb12a7121a6b87a0e5d87be39b':
  Be smarter about stack-protector on the host.
2015-12-14 13:53:53 -08:00
Elliott Hughes 02191c97ef Merge "Enable -fstack-protector-strong for x86-64." 2015-12-14 21:45:40 +00:00
Elliott Hughes 19e85a25ee Merge "Be smarter about stack-protector on the host." 2015-12-14 21:41:58 +00:00
Elliott Hughes 505e4ec646 Be smarter about stack-protector on the host.
Some projects are still built with our host GCC 4.8, which doesn't
support -fstack-protector-strong. The combo .mk files are used by
GCC and clang, so it's not safe to turn on -fstack-protector-strong
there. Instead, do it in the clang-specific .mk for now.

We can clean this up when elfutils (the last code built for the host
with GCC that I'm aware of) is built by clang. We'll be able to
remove the host GCC prebuilts too!

Change-Id: I314b9eab071c132a8e2cb8cc779a75ae8abb12e2
2015-12-14 13:20:59 -08:00
Elliott Hughes 249fa3c25e Merge "Enable -fstack-protector-strong for x86." am: 7abad39b78
am: 49d443b6f7

* commit '49d443b6f717bc57371bf6dde950c9c5a7427151':
  Enable -fstack-protector-strong for x86.
2015-12-14 13:20:46 -08:00