Commit Graph

11922 Commits

Author SHA1 Message Date
Dan Willemsen
6f21a29a2c Remove redundant LIBART_IMG_{HOST,TARGET}_BASE_ADDRESS
These are exported by Soong. Caught by an upcoming change to mark
Soong-exported variables as readonly.

Test: Manual checking that the values are still the same.
Change-Id: I18e2bca588c57809c16a9f0c386aad432bfbee2c
2016-10-04 22:28:49 -07:00
Colin Cross
6239173b12 Merge "Fix empty mac .toc generation" am: 7bc7704921 am: 8497a34201 am: 02f33e2457
am: 432316a05a

Change-Id: I5dd507a94d13d9c0646fe11787a8f9f882bc9ae9
2016-10-05 02:44:39 +00:00
Colin Cross
432316a05a Merge "Fix empty mac .toc generation" am: 7bc7704921 am: 8497a34201
am: 02f33e2457

Change-Id: Iad956e6316f91a666d976c718cf1af2c0caca508
2016-10-05 02:42:38 +00:00
Colin Cross
02f33e2457 Merge "Fix empty mac .toc generation" am: 7bc7704921
am: 8497a34201

Change-Id: I840fa05db353abd5e1adc959246113c04bb5f0f1
2016-10-05 02:40:09 +00:00
Colin Cross
7bc7704921 Merge "Fix empty mac .toc generation" 2016-10-05 02:35:02 +00:00
Colin Cross
86598b90c7 Merge "Don't prune $(OUT_DIR) from findleaves.py" am: 6338f23a36 am: bad4b072de am: 6f8ca7f502
am: 6f4a2a3bf0

Change-Id: I1bf73c6cf463ea8f6ff1dc1c212b534f2f84707a
2016-10-05 01:49:26 +00:00
Colin Cross
6f4a2a3bf0 Merge "Don't prune $(OUT_DIR) from findleaves.py" am: 6338f23a36 am: bad4b072de
am: 6f8ca7f502

Change-Id: I96360f13b75b4895545585a1019c703928cc8631
2016-10-05 01:47:24 +00:00
Colin Cross
6f8ca7f502 Merge "Don't prune $(OUT_DIR) from findleaves.py" am: 6338f23a36
am: bad4b072de

Change-Id: Ie8fe8c7e3172f25f751a21276807c3046c795d93
2016-10-05 01:44:53 +00:00
Dan Willemsen
ea99c1da30 Package up proguard jack_dictionary
Bug: 31182185
Bug: 31240674
Test: m dist in an unbundled branch
(cherry picked from commit b6c061e9ff)
Change-Id: I7ee1ba076cfa03f294f8231f6bdd8fa8df5557af
2016-10-05 01:36:58 +00:00
Colin Cross
cff9a64a48 Fix empty mac .toc generation
If a shared library has no exported symbols grep will return exit code
1 meaning no matches, but this should not be considered an error
during toc generation.

Test: external/clang/build.py
Change-Id: If589da38ad8b844fe1aff4738481cebea75cca42
2016-10-04 17:01:29 -07:00
Colin Cross
ae58e2bfa5 Don't prune $(OUT_DIR) from findleaves.py
Pruning $(OUT_DIR) can be overaggressive if $(OUT_DIR) matches the name
of any directory in the source tree that contains Android.mk files.
Pruning $(OUT_DIR) is no longer necessary, as one of the first things
the build system does is put an empty Android.mk file in there to avoid
recursing into it.

Bug: 31941856
Test: m -j OUT_DIR=angler
Change-Id: I7c5e95816f35bd5906845716d56cca76de7fa1ad
2016-10-04 16:35:21 -07:00
David Zeuthen
4e9c89ab87 resolve merge conflicts of 86180eb to nyc-mr1-dev-plus-aosp
Change-Id: Ia4bfb2571bac509cebe22f70ff43e6696f832423
2016-10-04 18:53:34 -04:00
David Zeuthen
86180ebab9 Merge "Make room for AVB hashtree and metadata." am: 70209ad9f0
am: b5b638f7fa

Change-Id: I2bdfd752ff2082b241ad5fbf88e89644d9cd2f3f
2016-10-04 22:39:21 +00:00
Chih-hung Hsieh
9b9246c58d Merge "Accept environment variables DEFAULT_*_TIDY_CHECKS" am: 4b4b2da13d am: 8d4da5f521 am: 8a81b9c5a0
am: 7db63a8293

Change-Id: I1b29a147c95deb74283c16362af0ac72714b7c97
2016-10-04 22:37:21 +00:00
Chih-hung Hsieh
7db63a8293 Merge "Accept environment variables DEFAULT_*_TIDY_CHECKS" am: 4b4b2da13d am: 8d4da5f521
am: 8a81b9c5a0

Change-Id: I04d9acb6b623c7e54a0f8d2bcd2cb8c3d3897cdd
2016-10-04 22:34:50 +00:00
Chih-hung Hsieh
8a81b9c5a0 Merge "Accept environment variables DEFAULT_*_TIDY_CHECKS" am: 4b4b2da13d
am: 8d4da5f521

Change-Id: If8c4a4d844d4ac2edbd8e173030902cab5ee0f7f
2016-10-04 22:32:50 +00:00
David Zeuthen
70209ad9f0 Merge "Make room for AVB hashtree and metadata." 2016-10-04 22:32:27 +00:00
Chih-hung Hsieh
4b4b2da13d Merge "Accept environment variables DEFAULT_*_TIDY_CHECKS" 2016-10-04 22:25:26 +00:00
David Zeuthen
4014a9daa7 Make room for AVB hashtree and metadata.
While the system.img images currently built with AVB support verify
correctly, mounting the filesystem content fails. This is because
'avbtool add_hashtree_footer' used to claim some of the unused /
DONT_CARE space for stashing the verity tables and this resulting in the
mapped device ending up being smaller causing the mount failure.

Fix this by leaving enough room for AVB hashtree and metadata before
building the image. This is achieved by moving the AVB hashtree support
into build_image.py and using a just added '--calc_max_image_size'
option to 'avbtool add_hashtree_footer' to figure out how much space to
leave out.

This depends on https://android-review.googlesource.com/#/c/281821/

Bug: 31264226
Test: Mounting dm-verity set up from system.img now works.

Merged-In: I4c5de1004c1059f8c582e76b3b8517d427aa1a87

Change-Id: I945a5f1f6782791736cd319f216cfa6b448fb04d
2016-10-04 17:32:16 -04:00
David Zeuthen
f892ac33ec Merge "Make room for AVB hashtree and metadata." 2016-10-04 21:30:18 +00:00
Colin Cross
1132b04aba Merge "Enable toc optimization for host builds" am: 5d8c73e373 am: 4276c12d20 am: e4e04c2f92
am: 46e7aa81e0

Change-Id: Id50148e31237e6b9fdf2f795aa2d41233fe2adaf
2016-10-04 21:10:15 +00:00
Colin Cross
46e7aa81e0 Merge "Enable toc optimization for host builds" am: 5d8c73e373 am: 4276c12d20
am: e4e04c2f92

Change-Id: I4db91a8f0893faa317ec7afb2e3f5d84dfcc91cf
2016-10-04 21:08:47 +00:00
Colin Cross
e4e04c2f92 Merge "Enable toc optimization for host builds" am: 5d8c73e373
am: 4276c12d20

Change-Id: I5bd72f5d2f8e689152d7f496b39afcacf5850371
2016-10-04 21:04:25 +00:00
Dan Willemsen
932a406948 Support dist-ing the userdatatarball
am: bee409ba50

Change-Id: I659273a8d5f085ca1f3e5291b028847ee58665d4
2016-10-04 17:37:25 +00:00
Chih-Hung Hsieh
8fdda6e495 Accept environment variables DEFAULT_*_TIDY_CHECKS
* Define DEFAULT_GLOBAL_TIDY_CHECKS/DEFAULT_EXTERNAL_VENDOR_TIDY_CHECKS
  only if it is not already defined.

Bug: http://b/27779618
Test: build with WITH_TIDY=1 and define those variables.
Change-Id: I201c9da3769d6ef658a75d4a1bf42ec6816d4069
2016-10-04 10:18:02 -07:00
Dan Willemsen
bee409ba50 Support dist-ing the userdatatarball
So that we can get to the contents of userdata from the build server
without extracting the image.

Bug: 27719200
Test: m userdatatarball dist
(cherry-picked from 69af2e4102)

Change-Id: I1438597bd29df80665571f7dc3b4957b9adde870
2016-10-04 15:49:34 +00:00
Ryan Campbell
c209ef8ce1 Support multiple arch for coverage packaging.
Modify copy rule to support multiple architectures. Use a method
similar to symbols.

Test: make lights.bullhead NATIVE_COVERAGE=true COVERAGE_PATHS=test/vts/hals/light/
Bug: 31911253
Change-Id: Ib3c53b4b305cbfcfd186010c5500b8d678190ddf
2016-10-03 18:23:40 -07:00
Colin Cross
d2ff157159 Enable toc optimization for host builds
The toc optimization had been disabled for host builds to ensure that
the timestamp of the final binary changed whenever its implementation
changed, in order to support rerunning host tools that were modified
during incremental builds.  However, only the final install rule must be
re-run to update the timestamp, and not the link rule.

Update the shared library install dependencies to use normal
dependencies instead of order-only dependencies for host modules, and
then enable the the toc optimization for host modules.  If the
implementation of a library changes it will be reinstalled, and
libraries or binaries that depend on it will also be reinstalled.

Bug: 26015464
Test: m -j; touch art/disassembler/disassembler_x86.cc; m -j, verify
      out/host/linux-x86/bin/oatdump is updated
Change-Id: I0a14decc1994eb55ad269d841943aef66e320c63
2016-10-03 17:53:44 -07:00
Colin Cross
c7bfb32873 Merge "exec makeparallel" am: cf8afef2eb am: 46c08db556 am: 74e1ccf614
am: 82ee430d0a

Change-Id: I939021fa9661423870fd520c3f02f9d6b31ef722
2016-10-04 00:36:39 +00:00
Colin Cross
82ee430d0a Merge "exec makeparallel" am: cf8afef2eb am: 46c08db556
am: 74e1ccf614

Change-Id: I3fc58de48d785c5d222003ef4f4a12307a149efc
2016-10-04 00:34:30 +00:00
Colin Cross
25874aef64 Merge "Revert "Remove -d keepdepfile from ninja command line"" am: 6548b54dfd am: 88f14b6bb7
am: d46f4795ef

Change-Id: I49c3fe05eba8e4db5a1e4caec89dd41d3cde9d28
2016-10-04 00:34:18 +00:00
Colin Cross
74e1ccf614 Merge "exec makeparallel" am: cf8afef2eb
am: 46c08db556

Change-Id: I8de8bb26ba46583072dc38248cb51552ae724a0f
2016-10-04 00:30:27 +00:00
Colin Cross
d46f4795ef Merge "Revert "Remove -d keepdepfile from ninja command line"" am: 6548b54dfd
am: 88f14b6bb7

Change-Id: Ic92ca83c27066a9f21c11a3b4aec99f3a178e56f
2016-10-04 00:30:15 +00:00
Colin Cross
a5471a6723 exec makeparallel
bash doesn't kill children when it receives SIGTERM.  Since makeparallel
is the last command run by the shell, run it with exec to replace the
shell with makeparallel so make can send the signal directly to
makeparallel.

Bug: 31907490
Test: m -j & killall make; pgrep -a makeparallel
Change-Id: If8aeb51ec224234da5f05eae3382ce77f48a57e2
2016-10-03 15:33:06 -07:00
Colin Cross
647d383788 Revert "Remove -d keepdepfile from ninja command line"
This reverts commit 4aca571552.

Test: builds
Change-Id: Iddb3517a4596e84404db1738fa95eb15f435a42d
2016-10-03 15:28:58 -07:00
Dan Willemsen
3fbe1f7327 Merge "Optimize rebuilds by reducing $(shell) usage" am: f009531772 am: 466f4f2b9e am: c1aff754c4
am: 09bd2ae7d8

Change-Id: I3250258380faa279e6533e0eed3d7f12b916a4d3
2016-10-03 21:31:40 +00:00
Dan Willemsen
09bd2ae7d8 Merge "Optimize rebuilds by reducing $(shell) usage" am: f009531772 am: 466f4f2b9e
am: c1aff754c4

Change-Id: I0f20752358facf3f41ce690c37f5696928ab5342
2016-10-03 21:29:46 +00:00
Dan Willemsen
c1aff754c4 Merge "Optimize rebuilds by reducing $(shell) usage" am: f009531772
am: 466f4f2b9e

Change-Id: Ic26ab0de0b14a400c11fe96c679b2ac60d76aade
2016-10-03 21:27:38 +00:00
Dan Willemsen
f009531772 Merge "Optimize rebuilds by reducing $(shell) usage" 2016-10-03 21:20:36 +00:00
David Zeuthen
52872baa78 Make room for AVB hashtree and metadata.
While the system.img images currently built with AVB support verify
correctly, mounting the filesystem content fails. This is because
'avbtool add_hashtree_footer' used to claim some of the unused /
DONT_CARE space for stashing the verity tables and this resulting in the
mapped device ending up being smaller causing the mount failure.

Fix this by leaving enough room for AVB hashtree and metadata before
building the image. This is achieved by moving the AVB hashtree support
into build_image.py and using a just added '--calc_max_image_size'
option to 'avbtool add_hashtree_footer' to figure out how much space to
leave out.

This depends on https://android-review.googlesource.com/#/c/281821/

Bug: 31264226
Test: aosp_x86_64-eng 'm' and 'm dist' successful.
Change-Id: I4c5de1004c1059f8c582e76b3b8517d427aa1a87
2016-10-03 14:07:41 -04:00
Dan Willemsen
b011810c25 Optimize rebuilds by reducing $(shell) usage
$(shell) isn't particularly fast in Kati, and they have to be executed
both when reading the makefiles and determining whether the ninja file
needs to be regenerated.

Right now, the regen time is mostly hidden because we run them in
parallel. We've also configured it to ignore any commands that contain
"echo", "date", or the output directory. That happens to remove most
commands that contain side effects, so running them in parallel is fine.

But the side effects contain some important things, like the clean up
necessary when switching products. So I'm removing those filters, and
then we'll need to run the shell commands in sequence, since there will
be side-effects. That makes regen take longer though, so use pure-Make
implementations instead of $(shell) where possible.

This set of changes reduces aosp/master aosp_arm64-eng build $(shell)
usage and time by 2/3:

*kati*: func shell time: 3.135095 / 709
*kati*: func shell time: 1.067331 / 236

Bug: 30947985
Test: Manual test lines for math functions
Test: Compare build-aosp_arm64.ninja before/after
Change-Id: I4fc9d6318957992921972994f277c17918e7e1eb
2016-09-30 21:14:13 -07:00
Dan Willemsen
906d068436 Merge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE" am: 847d965b9e am: 8c42bd3ae4 am: cab982825c
am: 5ec91e5376

Change-Id: I93efe7b69206b2e9f62735f6611112227ec27496
2016-10-01 02:05:51 +00:00
Dan Willemsen
5ec91e5376 Merge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE" am: 847d965b9e am: 8c42bd3ae4
am: cab982825c

Change-Id: I1586f98be30f97fc2d759a847875a67fc84d8c56
2016-10-01 01:59:23 +00:00
Dan Willemsen
cab982825c Merge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE" am: 847d965b9e
am: 8c42bd3ae4

Change-Id: I01c6bb2333ac66f266dac5755c73a1ab0f5161d1
2016-10-01 01:52:17 +00:00
Dan Willemsen
847d965b9e Merge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE" 2016-10-01 01:43:37 +00:00
Chih-Hung Hsieh
f3ae1a441e Merge "Use DEFAULT_EXTERNAL_VENDOR_TIDY_CHECKS for vendor/google_devices" am: 3d38042a00 am: c3118d2cd2 am: 2a9f96a1ee
am: 80d9efd0a3

Change-Id: I47140fc6faba804ff2a943a5b67d6d7217e05b25
2016-10-01 00:36:03 +00:00
Chih-Hung Hsieh
80d9efd0a3 Merge "Use DEFAULT_EXTERNAL_VENDOR_TIDY_CHECKS for vendor/google_devices" am: 3d38042a00 am: c3118d2cd2
am: 2a9f96a1ee

Change-Id: I2ececde5410784cc7bb5228ee79dd7de8ed4747f
2016-09-30 23:43:10 +00:00
Chih-Hung Hsieh
2a9f96a1ee Merge "Use DEFAULT_EXTERNAL_VENDOR_TIDY_CHECKS for vendor/google_devices" am: 3d38042a00
am: c3118d2cd2

Change-Id: I699d22bd5cf4593e31a702aa81c98104ab84874a
2016-09-30 23:39:36 +00:00
Treehugger Robot
3d38042a00 Merge "Use DEFAULT_EXTERNAL_VENDOR_TIDY_CHECKS for vendor/google_devices" 2016-09-30 23:25:17 +00:00
Chih-Hung Hsieh
10efc73c06 Use DEFAULT_EXTERNAL_VENDOR_TIDY_CHECKS for vendor/google_devices
Many source files under vendor/google_devices
are old third party code with too many clang-tidy
misc-macro-parentheses warnings.

Test: build with WITH_TIDY=1
Change-Id: I79248af3ece9c7a4436b8cf5e6c25f224fd8201b
2016-09-30 14:50:43 -07:00