Commit Graph

9157 Commits

Author SHA1 Message Date
Wei Wang
a22d0a88ba Merge "Include BRILLO_VENDOR_PARTITIONS in target zip generation"
am: 648ea82b04

* commit '648ea82b048a83dfcc68aa3419523502b3a1485f':
  Include BRILLO_VENDOR_PARTITIONS in target zip generation

Change-Id: I9aa55d82d8121b66dd853cf434b2a68b4dbbab68
2016-05-11 21:57:08 +00:00
Chih-Hung Hsieh
16af95b4a5 Merge "Add misc-macro-parentheses to default tidy checks."
am: a55b7ec4c3

* commit 'a55b7ec4c38f5de172d51e805215505196c7702d':
  Add misc-macro-parentheses to default tidy checks.

Change-Id: I2e93d50500ee3c6746aa805f0f6b268c07687c7f
2016-05-11 21:57:03 +00:00
Treehugger Robot
648ea82b04 Merge "Include BRILLO_VENDOR_PARTITIONS in target zip generation" 2016-05-11 21:49:56 +00:00
Chih-Hung Hsieh
e1ea9434c1 Add misc-macro-parentheses to default tidy checks.
* Disable this check in external projects.

Bug: 28705665
Change-Id: Ia44a15765fd637dae36b5e0f2b59ee4280b139c9
2016-05-11 13:43:11 -07:00
Wei Wang
2e735ca34e Include BRILLO_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.

The target zip will include images in BRILLO_VENDOR_PARTITIONS if
defined, under VENDOR_IMAGES/ with path kept. Also any vendor partitions
defined in AB_OTA_PARTITIONS will be copied to IMAGES/ in the target zip.

BUG: 28623063
Change-Id: Ic479048dfb8ac506acf827865e784fcb0432a1d5
2016-05-11 12:26:04 -07:00
Wei Wang
b1963b65a4 Merge "Revert "Include vendor partitions in target zip generation""
am: 7ff7c2d870

* commit '7ff7c2d8709bf1f8fa6e6d8350dcea63f1a9b3e8':
  Revert "Include vendor partitions in target zip generation"

Change-Id: I76559ad1211a38eecd7b15ec1a4b5ca5bd3f6914
2016-05-11 15:18:42 +00:00
Tao Bao
7ff7c2d870 Merge "Revert "Include vendor partitions in target zip generation"" 2016-05-11 15:11:57 +00:00
Wei Wang
05e6f679e6 Revert "Include vendor partitions in target zip generation"
This reverts commit 421fe44ae8.

Change-Id: Id45781de73735783bc7dfb6fc2838957578d00d3
2016-05-11 14:49:50 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Pirama Arumuga Nainar
fa4ff9defd Merge "Update RS to use latest Clang-2812033 prebuilts as well." 2016-05-04 21:00:07 +00:00
Colin Cross
ca3b61038c Merge "Update path to reverse_path.py"
am: 2614bdb876

* commit '2614bdb876e9a6bd732d41679b91ec9627c57e34':
  Update path to reverse_path.py

Change-Id: I0d7f47ee3ca4d6ac143b2c580337c74fa053f09e
2016-05-03 21:17:25 +00:00
Colin Cross
2614bdb876 Merge "Update path to reverse_path.py" 2016-05-03 21:13:22 +00:00
Colin Cross
367ab2989a Update path to reverse_path.py
Change-Id: I98902e94a99fae7f9e738a872a83acb98d32c781
2016-05-02 15:31:17 -07:00
Igor Murashkin
d581330855 Merge "old-cts: Add testng and libcoreoj test support"
am: 11821a1e1e

* commit '11821a1e1e1360ceb1ad83f55715d7415c385633':
  old-cts: Add testng and libcoreoj test support

Change-Id: I0f838aebab9aea750217e9351e03f19410ba049c
2016-05-02 20:55:54 +00:00
Igor Murashkin
11821a1e1e Merge "old-cts: Add testng and libcoreoj test support" 2016-05-02 20:40:09 +00:00
Chih-Hung Hsieh
336e44fc3f Merge "Suppress google-* checks in vendor modules."
am: f2592e192d

* commit 'f2592e192da6fcea5233b073149751c9ee687ab9':
  Suppress google-* checks in vendor modules.

Change-Id: Id501346744dd238120c428cdf5ebb9815a438bd2
2016-04-30 00:44:49 +00:00
Stephen Hines
348b81a404 Update RS to use latest Clang-2812033 prebuilts as well.
Change-Id: I62e294e2b8c882c235a6ac7518fa352acd46e055
2016-04-29 16:50:48 -07:00
Chih-Hung Hsieh
30f86e4ab8 Suppress google-* checks in vendor modules.
Too many warnings in vendor code that we cannot fix yet.

Bug: http://b/27779618
Change-Id: I8b65b1fd55c4e4d0dadf0617ab25962809237309
2016-04-29 15:16:59 -07:00