Commit Graph

10354 Commits

Author SHA1 Message Date
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
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
dc555c14d3 Merge "Update path to reverse_path.py" am: 2614bdb876
am: ca3b61038c

* commit 'ca3b61038cbf8019053eb24e48e9a57a85e9b2be':
  Update path to reverse_path.py

Change-Id: I769b2bbef04e19aa87e1f7c57e36ffcda5d534ad
2016-05-03 21:19:44 +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
Tao Bao
be9457cad2 Pack base_fs files into target_files.zip.
am: f54216f292

* commit 'f54216f29238a67aad1199a0e85d09e443740bf0':
  Pack base_fs files into target_files.zip.

Change-Id: Ia68c3a707def1865151f071ca33a3bdc513f9045
2016-05-02 16:45:31 +00:00
Tao Bao
f54216f292 Pack base_fs files into target_files.zip.
Pack the base_fs files ({system,vendor}.map) into target_files.zip,
which would be needed when rebuilding the images at signing.

Reset the base_fs paths to point to the files in META/.

Also add blk_alloc_to_base_fs into otatools.zip.

Bug: 27698960
Change-Id: If4eb274b3f3d839c4365624f46f0dc89bd2fa440
2016-04-30 23:56:10 -07:00
Chih-hung Hsieh
e49c261cb4 Merge "Suppress google-* checks in vendor modules." am: f2592e192d
am: 336e44fc3f

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

Change-Id: I6a60ec1ef74a7e83368e06139984d7c6f7bfc5ba
2016-04-30 00:47:06 +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
Adam Lesinski
54d4d765ba Merge "Call aapt2 link with argument-list" into nyc-dev
am: dfd6197f51

* commit 'dfd6197f5173b957b6e41a83df66d04068fa6517':
  Call aapt2 link with argument-list

Change-Id: I34e64e07736d428ca87044ac07a952be50531464
2016-04-29 22:13:20 +00:00
Adam Lesinski
dfd6197f51 Merge "Call aapt2 link with argument-list" into nyc-dev 2016-04-29 22:09:01 +00:00
Todd Kennedy
a9ce97d223 Merge "Only align when necessary" into nyc-dev
am: 1ccfe52630

* commit '1ccfe5263008991aeff10964da3bdc6c2c1c1d06':
  Only align when necessary

Change-Id: I2452df91a9c97a0b7d2d182165384d63ce040a09
2016-04-29 21:02:31 +00:00
Todd Kennedy
1ccfe52630 Merge "Only align when necessary" into nyc-dev 2016-04-29 20:59:04 +00:00
Todd Kennedy
3f18099610 Only align when necessary
Bug: 27887819
Change-Id: Ie8b5ca31cc1c08943588fc6039d75190ff7eeb8b
2016-04-29 13:58:13 -07:00
Adam Lesinski
8d1e2fdcba Call aapt2 link with argument-list
Also follow symbolic links when looking for assets.

Bug:22775504
Change-Id: I971e23505f766a2192469df1aad55bc20c46f618
2016-04-28 15:10:18 -07:00