Commit Graph

32079 Commits

Author SHA1 Message Date
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
David Zeuthen b5b638f7fa Merge "Make room for AVB hashtree and metadata."
am: 70209ad9f0

Change-Id: Ib9da55a7dd11d94f2044493ed932069de6c6eb74
2016-10-04 22:37:22 +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 8d4da5f521 Merge "Accept environment variables DEFAULT_*_TIDY_CHECKS"
am: 4b4b2da13d

Change-Id: I61b05ed9a74875c43ef268d67ee9e2e5d494c2ce
2016-10-04 22:30:52 +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
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
Colin Cross 4276c12d20 Merge "Enable toc optimization for host builds"
am: 5d8c73e373

Change-Id: I0dae6e9a2d7e759b8c3860d3b4e7a85f04f5aecb
2016-10-04 21:02:26 +00:00
Colin Cross 5d8c73e373 Merge "Enable toc optimization for host builds" 2016-10-04 20:57:53 +00:00
Dan Willemsen 6cc6a2c9e8 Support dist-ing the userdatatarball am: bee409ba50
am: 932a406948

Change-Id: Ifd75cef28ff627c0f52d43c31a5dc376f9d7703d
2016-10-04 17:38:41 +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
Przemyslaw Szczepaniak 5581232132 Merge "Fix for non-empty a[name] tags in openJdk based javadocs." am: a8c8dadd09 am: 8dd4374689 -s ours
am: 780ab61160

Change-Id: Ic879384fb73a72b280e2be883220253c6262eb0b
2016-10-04 11:50:57 +00:00
Przemyslaw Szczepaniak 780ab61160 Merge "Fix for non-empty a[name] tags in openJdk based javadocs." am: a8c8dadd09
am: 8dd4374689  -s ours

Change-Id: I57a1638e7d632f6dd50b2d47c078d9371ff2968c
2016-10-04 11:48:53 +00:00
Przemyslaw Szczepaniak 8dd4374689 Merge "Fix for non-empty a[name] tags in openJdk based javadocs."
am: a8c8dadd09

Change-Id: Ide86ed97b14d3c34c6210b9ea9d24b8f3733c090
2016-10-04 11:38:51 +00:00
Przemyslaw Szczepaniak a8c8dadd09 Merge "Fix for non-empty a[name] tags in openJdk based javadocs." 2016-10-04 11:35:58 +00:00
Przemyslaw Szczepaniak 4bce2866fb Fix for non-empty a[name] tags in openJdk based javadocs.
openJdk based android javadoc contains <a name=... tags
that are non-empty. Currently they are being hidden,
causing badly formatted pages for some java.* classes
(missing text and random whitespace blocks).

This change makes the existing a[name] hiding rule
apply only to empty tags.

Test: make docs
Bug: 31700998
Change-Id: Ifa75bbabe308d7aed0cce6165c1113e5a382a121
(cherry picked from commit a7edd92c45)
2016-10-04 10:31:54 +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 c66ad83f43 Merge "Propagate signals through makeparallel" am: e0f42b41f6 am: 6f4807da4b
am: fd00ed23a9

Change-Id: I322f8cecc72e64a6c318e04950c0d200c7f9ef6b
2016-10-04 00:34:44 +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 fd00ed23a9 Merge "Propagate signals through makeparallel" am: e0f42b41f6
am: 6f4807da4b

Change-Id: Ia2a896df2782603b68c4dd5d348bcc7f5d661933
2016-10-04 00:30:39 +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 6f4807da4b Merge "Propagate signals through makeparallel"
am: e0f42b41f6

Change-Id: Ia68f218edd5e57f82bea3269a8fb863077e28082
2016-10-04 00:28:39 +00:00
Colin Cross 46c08db556 Merge "exec makeparallel"
am: cf8afef2eb

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

Change-Id: I82aa023b881f277d419fdcdf09cd510b804217c2
2016-10-04 00:28:16 +00:00
Colin Cross e0f42b41f6 Merge "Propagate signals through makeparallel" 2016-10-04 00:23:54 +00:00
Colin Cross cf8afef2eb Merge "exec makeparallel" 2016-10-04 00:23:47 +00:00
Colin Cross 6548b54dfd Merge "Revert "Remove -d keepdepfile from ninja command line"" 2016-10-04 00:23:37 +00:00
Colin Cross 49c45aecc4 Propagate signals through makeparallel
Set up a signal handler in makeparallel that will forward SIGHUP,
SIGINT, SIGQUIT, and SIGTERM to the child process.

Bug: 31907490
Test: m -j & killall make; pgrep -a ninja
Test: make makeparallel_test
Change-Id: I306e5335ed1b2c7056804d5da377a2f283877f30
2016-10-03 15:33:11 -07: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 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 466f4f2b9e Merge "Optimize rebuilds by reducing $(shell) usage"
am: f009531772

Change-Id: I765a59826d058867abe8dd7a851ed06936fd4321
2016-10-03 21:26:12 +00:00
Dan Willemsen f009531772 Merge "Optimize rebuilds by reducing $(shell) usage" 2016-10-03 21:20:36 +00: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 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 8c42bd3ae4 Merge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE"
am: 847d965b9e

Change-Id: Iab6362844a327f559a5471605ba176e075703a72
2016-10-01 01:48:46 +00:00
Dan Willemsen 847d965b9e Merge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE" 2016-10-01 01:43:37 +00:00
Dirk Dougherty 9eaa714bf5 For ds builds only, emit a separate metadata file for samples only. am: a9fcf48078 am: fd40bbc586 am: 3d58e7f387
am: 77475e522f

Change-Id: Idac070c7a6b866a753c4b292b4c4c28e3be3dce5
2016-10-01 01:21:44 +00:00
Dirk Dougherty 77475e522f For ds builds only, emit a separate metadata file for samples only. am: a9fcf48078 am: fd40bbc586
am: 3d58e7f387

Change-Id: Iec35ec96194a76c67dec543cf28184f0d0c2e549
2016-10-01 01:19:00 +00:00