Commit Graph

10777 Commits

Author SHA1 Message Date
Wei Wang
90b4658904 Merge "Include vendor partitions in target zip generation" am: bb05fd768c
am: eb06b4d3b3

* commit 'eb06b4d3b3862759ca15e9c52802808debc0a295':
  Include vendor partitions in target zip generation

Change-Id: I9646c90fbe5c57a1f8c6022b8aad03f4e19f56e7
2016-05-11 02:27:00 +00:00
Wei Wang
eb06b4d3b3 Merge "Include vendor partitions in target zip generation"
am: bb05fd768c

* commit 'bb05fd768c49273a6cdf49eb2889c608b36ba41d':
  Include vendor partitions in target zip generation

Change-Id: Ib46cc59880ae1b30f97c98b8d2abbefcd0851a7e
2016-05-11 02:24:24 +00:00
Treehugger Robot
bb05fd768c Merge "Include vendor partitions in target zip generation" 2016-05-11 02:18:58 +00:00
Andreas Gampe
01789d079a Build: Switch on oat file mini-debug-info for boot.oat
am: a20910f495

* commit 'a20910f49587fba5fe84dd94eb25aa6d5399e2c4':
  Build: Switch on oat file mini-debug-info for boot.oat

Change-Id: Ib0403abde8c8bc3761c20348946f283e1a9c48f9
2016-05-11 01:22:42 +00:00
Dan Willemsen
56242e5ca5 Merge "Add a 32-bit x86_64 arch variant" am: 19b7692496
am: f51e73d8bf

* commit 'f51e73d8bf10c32cee5bc9bded78949e50bb9b1c':
  Add a 32-bit x86_64 arch variant

Change-Id: Ib5f51ddcdec6f38a9cfc8f6182b6919c4f24aee6
2016-05-11 00:49:22 +00:00
Dan Willemsen
f51e73d8bf Merge "Add a 32-bit x86_64 arch variant"
am: 19b7692496

* commit '19b76924969de45f77334a5e7d86b22362a8d845':
  Add a 32-bit x86_64 arch variant

Change-Id: Ia2d708a0d2159d39cafbbf9589e2c4d296e3ffb1
2016-05-11 00:46:42 +00:00
Dan Willemsen
19b7692496 Merge "Add a 32-bit x86_64 arch variant" 2016-05-11 00:35:59 +00:00
Dan Willemsen
cb268e126f Merge "Do not apply -Wl,--fix-cortex-a8 to Cortex-A9" am: 3027e5fca9
am: 180d60a086

* commit '180d60a0867972f8aff7d47dc322a5514d3a1ba2':
  Do not apply -Wl,--fix-cortex-a8 to Cortex-A9

Change-Id: I03ae36ffaf833b0d86700a1cbed629545052e92b
2016-05-10 23:42:30 +00:00
Dan Willemsen
180d60a086 Merge "Do not apply -Wl,--fix-cortex-a8 to Cortex-A9"
am: 3027e5fca9

* commit '3027e5fca982bc64e66366a2cbe965238536a395':
  Do not apply -Wl,--fix-cortex-a8 to Cortex-A9

Change-Id: I14eaefd54c3beebe3fe8c948fe22dce5de2c42f5
2016-05-10 23:39:55 +00:00
Dan Willemsen
9826900aea Do not apply -Wl,--fix-cortex-a8 to Cortex-A9
Change-Id: I11d380163423cb4aa0fee60ecbaa1e38fa5143a1
2016-05-10 15:36:58 -07:00
Dan Willemsen
04aa521eca Add a 32-bit x86_64 arch variant
The current 32-bit configuration for generic x86_64 targets inherits some
variables (SSE4 support) from the 64-bit configuration, and overrides
the make variables used for other configurations (SSSE3). Ideally, these
would be using different variables, but until then, unify the
configuration for x86_64 targets so that everything is consistent.

Bug: 28694691
Change-Id: I47e67299d4c632e7491d7e73dc0fc6480ef08006
2016-05-10 14:15:41 -07:00
Nicholas Sauer
088230cb34 Add org.apache.harmony.tests.javax.xml to old cts
bug: 28556024
Change-Id: I7903ce93f27aef55f55acc9231e631d11a463f1b
2016-05-10 12:54:32 -07:00
Wei Wang
421fe44ae8 Include vendor partitions in target zip generation
This change will enable the target zip to include partition defined in
BRILLO_VENDOR_PARTITIONS. This is necessary for OTA to support
partitions other than boot and system in ab_partitions.txt.

BUG: 28623063
Change-Id: I6e0969c31c9ad2e8285c6f560825c160aa8c4d55
2016-05-10 11:00:09 -07:00
Dan Willemsen
0ff677047c Merge "Fix build system documentation example" am: af14b921af
am: edd4857d24

* commit 'edd4857d24306b9f1ad1d5f3eda744eaded9564f':
  Fix build system documentation example

Change-Id: I3d67ef458b4aeedea7c6b71ec12081b07c98a76e
2016-05-09 23:57:24 +00:00
Dan Willemsen
edd4857d24 Merge "Fix build system documentation example"
am: af14b921af

* commit 'af14b921afc607200c086d0326ae4cb11bbd0545':
  Fix build system documentation example

Change-Id: I95d39419f861d72ceb3ce669e289b4396d8a9dec
2016-05-09 23:51:44 +00:00
Dan Willemsen
af14b921af Merge "Fix build system documentation example" 2016-05-09 23:37:44 +00:00
Dan Willemsen
54b9967bb6 Merge "Remove -mcpu=cortex-a15 when adding -mcpu=krait" am: f948dddfe0
am: 129ab6e97b

* commit '129ab6e97b62a7f483251862eff646273c9ae443':
  Remove -mcpu=cortex-a15 when adding -mcpu=krait

Change-Id: I054f2c5fa5cad744ab6a437ebd9a5aa1ac5c84bf
2016-05-09 23:01:11 +00:00
Dan Willemsen
129ab6e97b Merge "Remove -mcpu=cortex-a15 when adding -mcpu=krait"
am: f948dddfe0

* commit 'f948dddfe085554b6dbdd0271170d53c09bbb7cd':
  Remove -mcpu=cortex-a15 when adding -mcpu=krait

Change-Id: Iff13b081842522217be92ca9fdf725a6a793412a
2016-05-09 22:55:33 +00:00
Treehugger Robot
f948dddfe0 Merge "Remove -mcpu=cortex-a15 when adding -mcpu=krait" 2016-05-09 22:43:09 +00:00
Andreas Gampe
a20910f495 Build: Switch on oat file mini-debug-info for boot.oat
Enable mini-debug-info for the boot image by default. This
can be disabled with WITH_DEXPREOPT_DEBUG_INFO=false.

Bug: 28474219

(cherry picked from commit 58f6bfaa37)

Change-Id: Ifd59d854f01ad8cf703f16d7a6e88c2c82d47feb
2016-05-09 22:42:27 +00:00
Dan Willemsen
f5bbcac7aa Merge "Revert "[MIPS] Temporarily disable Mips shared-textrel errors"" am: 136fa4377d
am: c0bf8c16ca

* commit 'c0bf8c16ca937c1e2b887a76514be246fbb3571f':
  Revert "[MIPS] Temporarily disable Mips shared-textrel errors"

Change-Id: Ie92d3f290b8ecb642646dc660745c790d0f282c5
2016-05-09 22:33:21 +00:00
Dan Willemsen
c0bf8c16ca Merge "Revert "[MIPS] Temporarily disable Mips shared-textrel errors""
am: 136fa4377d

* commit '136fa4377d230ba9c7a53b998ac708a98c0d16c2':
  Revert "[MIPS] Temporarily disable Mips shared-textrel errors"

Change-Id: Ie2f2c6581f518c010454b32016cce31efc85ab19
2016-05-09 22:27:50 +00:00
Dan Willemsen
136fa4377d Merge "Revert "[MIPS] Temporarily disable Mips shared-textrel errors"" 2016-05-09 22:09:42 +00:00
Dan Willemsen
aeadf41e69 Remove -mcpu=cortex-a15 when adding -mcpu=krait
This is not necessary, since the later -mcpu=krait will override the
earlier -mcpu=cortex-a15, but is cleaner (and matches Soong).

Change-Id: I18301faf8a5cb5364617b3008bc8af461b7884f8
2016-05-09 14:55:10 -07:00
Dan Willemsen
593e670602 Revert "[MIPS] Temporarily disable Mips shared-textrel errors"
This reverts commit 3dfd20aea4 - the clang
version we are using has the mentioned permanent fix. The new build
system (Soong) uses a single list of unknown clang flags for all
architectures, so workarounds like this no longer work.

Change-Id: I64a83f3b52a9ca1d11a76df5a060a36f42e27e4b
2016-05-09 13:10:05 -07:00
Dan Willemsen
11e6daf789 Merge "Remove arm-specific -Wno-psabi" am: ce9b6cab53
am: 6377ca3210

* commit '6377ca3210553af8f75c87343f6cac21b745e480':
  Remove arm-specific -Wno-psabi

Change-Id: I168e11dd2011ade4d2e5a4108e3fa6ba3c45a9ff
2016-05-09 04:51:21 +00:00
Dan Willemsen
6377ca3210 Merge "Remove arm-specific -Wno-psabi"
am: ce9b6cab53

* commit 'ce9b6cab532c823cd452450d2ac06751f70e0a15':
  Remove arm-specific -Wno-psabi

Change-Id: If809176c0a4b7191bc75bd9ad05c37f3a0d0601f
2016-05-09 04:48:38 +00:00
Dan Willemsen
bdd2e8ebf9 Fix build system documentation example
The input and output file paths were mixed up in this example. Properly
indicate the input file as a dependency.

Change-Id: I71271025c6ce3ef8f82b10aee91fc0c7ae8f2399
2016-05-08 19:24:58 -07:00
Dan Willemsen
db14f793bc Remove arm-specific -Wno-psabi
This flag was added to stop a GCC 4.4 specific warning. Since we've
upgraded, this flag is no longer necessary. It's already stripped for
clang builds, and I found no instances in the logs after removing it.

Change-Id: If5316d2eb8066dc43d7af7aebc7e4920b4ada192
2016-05-06 17:08:24 -07:00
Ying Wang
dbe53e4bde resolve merge conflicts of e6b72b3 to nyc-dev-plus-aosp
Change-Id: Ic60ea2050c6e724e9bcbb5277087f1377315e9b3
2016-05-06 13:37:05 -07:00
Ying Wang
e6b72b3636 Merge "Harden dependency on generated sources."
am: 622b3c2764

* commit '622b3c27642fb8612d1c39e41d17941ca265b8c7':
  Harden dependency on generated sources.

Change-Id: I122feceab132d46bf0fe27c91ffbd331a9e84731
2016-05-06 20:29:14 +00:00
Elliott Hughes
1d0d43b354 Merge "Avoid accidentally using the host\'s native \'as\' command." am: e6710e9b90
am: 09dc0d4f76

* commit '09dc0d4f76dbf206c8e47a57d24e00b814c2bfc4':
  Avoid accidentally using the host's native 'as' command.

Change-Id: I395d81a67c73561c29e6353c65dd9f48334137d4
2016-05-06 20:24:25 +00:00
Alistair Strachan
09dc0d4f76 Merge "Avoid accidentally using the host\'s native \'as\' command."
am: e6710e9b90

* commit 'e6710e9b9065765645c72e15cb8953a34aab83dc':
  Avoid accidentally using the host's native 'as' command.

Change-Id: I66dc6048fc45ad6763b63e55ad2eb6e0d71a14ac
2016-05-06 20:19:42 +00:00
Treehugger Robot
622b3c2764 Merge "Harden dependency on generated sources." 2016-05-06 20:16:41 +00:00
Elliott Hughes
e6710e9b90 Merge "Avoid accidentally using the host's native 'as' command." 2016-05-06 20:11:45 +00:00
Ying Wang
05f9f35836 Harden dependency on generated sources.
Previously if a library has custom generated headers in
LOCAL_GENERATED_SOURCES and export its include path with
LOCAL_EXPORT_C_INCLUDE_DIRS, there is almost no way for the users of the
library to set up dependency of their object files on the generated
headers.
This change makes the generated sources dependency of the library's
export_includes, which is guaranteed generated before client code gets
compiled.

Also we added proto-generated cpp files to my_generated_sources so that
we can deal solely with $(my_generated_sources). Because many
Android.mks assume the generted .pb.hs are in $(generated_sources_dir)
instead of $(intermediates), we have to generate the source files in
$(generated_sources_dir) and make a copy in $(intermediates).

Bug: 28622149
Change-Id: I73b21443fa706f3735faf16356ed8c08fbfecca6
2016-05-06 10:20:17 -07:00
Dan Willemsen
38f44b9e9d Merge "Only pass NINJA_ARGS to the main ninja compile" am: 374c7facd5
am: 667a5fe33b

* commit '667a5fe33b8a9bb3e812a4923758e466926338cb':
  Only pass NINJA_ARGS to the main ninja compile

Change-Id: Ie713aa9cd7d0d9d10dabb8b999a8ebd2e029588c
2016-05-06 01:28:19 +00:00
Dan Willemsen
667a5fe33b Merge "Only pass NINJA_ARGS to the main ninja compile"
am: 374c7facd5

* commit '374c7facd565b4d896db20ee04c94e90dee4c8e7':
  Only pass NINJA_ARGS to the main ninja compile

Change-Id: I98f588bf7d9c39bf2a9ac7c07bfb15f19299694d
2016-05-06 01:23:43 +00:00
Dan Willemsen
9a97ba700b Only pass NINJA_ARGS to the main ninja compile
This way commands like "-t query <target>" will work against the main
build, instead of failing to find the target during the initial soong
build and stopping.

Change-Id: I9b6bd6ac431b95e12db69ec7f272669b9d292761
2016-05-05 16:55:21 -07:00
Colin Cross
42a5da7ca1 Default USE_SOONG to true
Change-Id: Iad88aed4060b84aef2381f6300f16bad14f3a6ca
2016-05-05 16:34:58 -07:00
Alistair Strachan
5ff9c81b6c Avoid accidentally using the host's native 'as' command.
When invoking clang for the host to assemble .S files, the -B flag
would not be provided, which allowed the host prebuilt clang to
use an 'as' from the native environment. Most of the time this
"just works", but some newer 'as' versions cause problems with
the older prebuilt toolchain, for example by generating
unsupported relocation types.

To avoid this problem, simply use the -B flag to tell clang to
invoke the assembler from the correct prebuilt gcc prefix.

Change-Id: I18ea4f37ae637b652cfd7321c41929f8be075342
Signed-off-by: Alistair Strachan <alistair.strachan@imgtec.com>
2016-05-05 16:29:08 -07:00
Colin Cross
5f1660ebf4 Merge "Update prebuilt build tools path" am: 405b73ea10
am: f51ed4020f

* commit 'f51ed4020fcabe9d7a8e7f72fb3852ff2871f0a1':
  Update prebuilt build tools path

Change-Id: I99082fbc8427454265e50ae2ca4235f48c426761
2016-05-05 19:07:28 +00:00
Colin Cross
f51ed4020f Merge "Update prebuilt build tools path"
am: 405b73ea10

* commit '405b73ea10cbe4a4d47c300643171df8f5569665':
  Update prebuilt build tools path

Change-Id: I4bb1ab3f85f9f30fcb326b856cc96fe9f51c4926
2016-05-05 19:03:07 +00:00
Colin Cross
405b73ea10 Merge "Update prebuilt build tools path" 2016-05-05 18:54:37 +00:00
Colin Cross
7a0bdb976a Merge "Pass SANTIIZE_HOST and SANITIZE_TARGET to soong" am: c9778e339d
am: 0206533827

* commit '020653382749a326deef2e46d248d59f49f1c378':
  Pass SANTIIZE_HOST and SANITIZE_TARGET to soong

Change-Id: I1cd5be269b1d813b529248b069ca94236eb7b15c
2016-05-04 23:41:15 +00:00
Colin Cross
0206533827 Merge "Pass SANTIIZE_HOST and SANITIZE_TARGET to soong"
am: c9778e339d

* commit 'c9778e339d936be09f4415413538617c64734967':
  Pass SANTIIZE_HOST and SANITIZE_TARGET to soong

Change-Id: I920a8fec171324d4077eb60ad8f812227893e917
2016-05-04 23:38:20 +00:00
Colin Cross
c9778e339d Merge "Pass SANTIIZE_HOST and SANITIZE_TARGET to soong" 2016-05-04 23:34:54 +00:00
Colin Cross
facdca17d5 Update prebuilt build tools path
Build tools have been moved from prebuilts/sdk/tools to
prebuilts/build-tools.

Bug: 27857138
Change-Id: I60be42c197d420897dab77808c25818c9d2e81df
2016-05-04 16:02:02 -07:00
Pirama Arumuga Nainar
6459fd6df6 Merge "Update RS to use latest Clang-2812033 prebuilts as well." am: fa4ff9defd
am: b2616db449

* commit 'b2616db449bc185e67bcf13aecf3d8712bdc41ad':
  Update RS to use latest Clang-2812033 prebuilts as well.

Change-Id: Icb9eb2ab6859cab03dbc09879e808ffd0915d39e
2016-05-04 21:37:13 +00:00
Stephen Hines
b2616db449 Merge "Update RS to use latest Clang-2812033 prebuilts as well."
am: fa4ff9defd

* commit 'fa4ff9defd768b43a030939cd4dc28ed281ae8b7':
  Update RS to use latest Clang-2812033 prebuilts as well.

Change-Id: Ic85416306e3f41b26c130b04125437ebccf8af5c
2016-05-04 21:25:18 +00:00