OSDN Git Service
Chih-hung Hsieh [Tue, 4 Oct 2016 22:34:50 +0000 (22:34 +0000)]
Merge "Accept environment variables DEFAULT_*_TIDY_CHECKS" am:
4b4b2da13d am:
8d4da5f521
am:
8a81b9c5a0
Change-Id: I04d9acb6b623c7e54a0f8d2bcd2cb8c3d3897cdd
Chih-hung Hsieh [Tue, 4 Oct 2016 22:32:50 +0000 (22:32 +0000)]
Merge "Accept environment variables DEFAULT_*_TIDY_CHECKS" am:
4b4b2da13d
am:
8d4da5f521
Change-Id: If8c4a4d844d4ac2edbd8e173030902cab5ee0f7f
Chih-hung Hsieh [Tue, 4 Oct 2016 22:30:52 +0000 (22:30 +0000)]
Merge "Accept environment variables DEFAULT_*_TIDY_CHECKS"
am:
4b4b2da13d
Change-Id: I61b05ed9a74875c43ef268d67ee9e2e5d494c2ce
Chih-hung Hsieh [Tue, 4 Oct 2016 22:25:25 +0000 (22:25 +0000)]
Merge "Accept environment variables DEFAULT_*_TIDY_CHECKS"
Colin Cross [Tue, 4 Oct 2016 21:08:47 +0000 (21:08 +0000)]
Merge "Enable toc optimization for host builds" am:
5d8c73e373 am:
4276c12d20
am:
e4e04c2f92
Change-Id: I4db91a8f0893faa317ec7afb2e3f5d84dfcc91cf
Colin Cross [Tue, 4 Oct 2016 21:04:25 +0000 (21:04 +0000)]
Merge "Enable toc optimization for host builds" am:
5d8c73e373
am:
4276c12d20
Change-Id: I5bd72f5d2f8e689152d7f496b39afcacf5850371
Colin Cross [Tue, 4 Oct 2016 21:02:26 +0000 (21:02 +0000)]
Merge "Enable toc optimization for host builds"
am:
5d8c73e373
Change-Id: I0dae6e9a2d7e759b8c3860d3b4e7a85f04f5aecb
Colin Cross [Tue, 4 Oct 2016 20:57:52 +0000 (20:57 +0000)]
Merge "Enable toc optimization for host builds"
Dan Willemsen [Tue, 4 Oct 2016 17:38:41 +0000 (17:38 +0000)]
Support dist-ing the userdatatarball am:
bee409ba50
am:
932a406948
Change-Id: Ifd75cef28ff627c0f52d43c31a5dc376f9d7703d
Dan Willemsen [Tue, 4 Oct 2016 17:37:25 +0000 (17:37 +0000)]
Support dist-ing the userdatatarball
am:
bee409ba50
Change-Id: I659273a8d5f085ca1f3e5291b028847ee58665d4
Chih-Hung Hsieh [Mon, 3 Oct 2016 04:31:04 +0000 (21:31 -0700)]
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
Dan Willemsen [Tue, 16 Aug 2016 23:36:05 +0000 (16:36 -0700)]
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
69af2e4102d3af3f5f06e4d7a615d42dbb3446bb)
Change-Id: I1438597bd29df80665571f7dc3b4957b9adde870
Przemyslaw Szczepaniak [Tue, 4 Oct 2016 11:50:57 +0000 (11:50 +0000)]
Merge "Fix for non-empty a[name] tags in openJdk based javadocs." am:
a8c8dadd09 am:
8dd4374689 -s ours
am:
780ab61160
Change-Id: Ic879384fb73a72b280e2be883220253c6262eb0b
Przemyslaw Szczepaniak [Tue, 4 Oct 2016 11:48:53 +0000 (11:48 +0000)]
Merge "Fix for non-empty a[name] tags in openJdk based javadocs." am:
a8c8dadd09
am:
8dd4374689 -s ours
Change-Id: I57a1638e7d632f6dd50b2d47c078d9371ff2968c
Przemyslaw Szczepaniak [Tue, 4 Oct 2016 11:38:51 +0000 (11:38 +0000)]
Merge "Fix for non-empty a[name] tags in openJdk based javadocs."
am:
a8c8dadd09
Change-Id: Ide86ed97b14d3c34c6210b9ea9d24b8f3733c090
Przemyslaw Szczepaniak [Tue, 4 Oct 2016 11:35:58 +0000 (11:35 +0000)]
Merge "Fix for non-empty a[name] tags in openJdk based javadocs."
Przemyslaw Szczepaniak [Mon, 26 Sep 2016 15:21:13 +0000 (16:21 +0100)]
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
a7edd92c457879f2719afe6b5d119886b869182f)
Colin Cross [Mon, 3 Oct 2016 23:49:02 +0000 (16:49 -0700)]
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
Colin Cross [Tue, 4 Oct 2016 00:34:44 +0000 (00:34 +0000)]
Merge "Propagate signals through makeparallel" am:
e0f42b41f6 am:
6f4807da4b
am:
fd00ed23a9
Change-Id: I322f8cecc72e64a6c318e04950c0d200c7f9ef6b
Colin Cross [Tue, 4 Oct 2016 00:34:30 +0000 (00:34 +0000)]
Merge "exec makeparallel" am:
cf8afef2eb am:
46c08db556
am:
74e1ccf614
Change-Id: I3fc58de48d785c5d222003ef4f4a12307a149efc
Colin Cross [Tue, 4 Oct 2016 00:34:18 +0000 (00:34 +0000)]
Merge "Revert "Remove -d keepdepfile from ninja command line"" am:
6548b54dfd am:
88f14b6bb7
am:
d46f4795ef
Change-Id: I49c3fe05eba8e4db5a1e4caec89dd41d3cde9d28
Colin Cross [Tue, 4 Oct 2016 00:30:39 +0000 (00:30 +0000)]
Merge "Propagate signals through makeparallel" am:
e0f42b41f6
am:
6f4807da4b
Change-Id: Ia2a896df2782603b68c4dd5d348bcc7f5d661933
Colin Cross [Tue, 4 Oct 2016 00:30:27 +0000 (00:30 +0000)]
Merge "exec makeparallel" am:
cf8afef2eb
am:
46c08db556
Change-Id: I8de8bb26ba46583072dc38248cb51552ae724a0f
Colin Cross [Tue, 4 Oct 2016 00:30:15 +0000 (00:30 +0000)]
Merge "Revert "Remove -d keepdepfile from ninja command line"" am:
6548b54dfd
am:
88f14b6bb7
Change-Id: Ic92ca83c27066a9f21c11a3b4aec99f3a178e56f
Colin Cross [Tue, 4 Oct 2016 00:28:39 +0000 (00:28 +0000)]
Merge "Propagate signals through makeparallel"
am:
e0f42b41f6
Change-Id: Ia68f218edd5e57f82bea3269a8fb863077e28082
Colin Cross [Tue, 4 Oct 2016 00:28:28 +0000 (00:28 +0000)]
Merge "exec makeparallel"
am:
cf8afef2eb
Change-Id: I77aaad7879d65b233e17a90f0196021105596c6e
Colin Cross [Tue, 4 Oct 2016 00:28:16 +0000 (00:28 +0000)]
Merge "Revert "Remove -d keepdepfile from ninja command line""
am:
6548b54dfd
Change-Id: I82aa023b881f277d419fdcdf09cd510b804217c2
Colin Cross [Tue, 4 Oct 2016 00:23:54 +0000 (00:23 +0000)]
Merge "Propagate signals through makeparallel"
Colin Cross [Tue, 4 Oct 2016 00:23:47 +0000 (00:23 +0000)]
Merge "exec makeparallel"
Colin Cross [Tue, 4 Oct 2016 00:23:37 +0000 (00:23 +0000)]
Merge "Revert "Remove -d keepdepfile from ninja command line""
Colin Cross [Mon, 3 Oct 2016 20:40:32 +0000 (13:40 -0700)]
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
Colin Cross [Mon, 3 Oct 2016 20:38:27 +0000 (13:38 -0700)]
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
Colin Cross [Mon, 3 Oct 2016 22:12:08 +0000 (15:12 -0700)]
Revert "Remove -d keepdepfile from ninja command line"
This reverts commit
4aca5715523d1b8a85abde00d7ccc2989c90a96b.
Test: builds
Change-Id: Iddb3517a4596e84404db1738fa95eb15f435a42d
Dan Willemsen [Mon, 3 Oct 2016 21:29:46 +0000 (21:29 +0000)]
Merge "Optimize rebuilds by reducing $(shell) usage" am:
f009531772 am:
466f4f2b9e
am:
c1aff754c4
Change-Id: I0f20752358facf3f41ce690c37f5696928ab5342
Dan Willemsen [Mon, 3 Oct 2016 21:27:38 +0000 (21:27 +0000)]
Merge "Optimize rebuilds by reducing $(shell) usage" am:
f009531772
am:
466f4f2b9e
Change-Id: Ic26ab0de0b14a400c11fe96c679b2ac60d76aade
Dan Willemsen [Mon, 3 Oct 2016 21:26:12 +0000 (21:26 +0000)]
Merge "Optimize rebuilds by reducing $(shell) usage"
am:
f009531772
Change-Id: I765a59826d058867abe8dd7a851ed06936fd4321
Dan Willemsen [Mon, 3 Oct 2016 21:20:36 +0000 (21:20 +0000)]
Merge "Optimize rebuilds by reducing $(shell) usage"
Dan Willemsen [Sat, 1 Oct 2016 00:30:32 +0000 (17:30 -0700)]
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
Dan Willemsen [Sat, 1 Oct 2016 01:59:23 +0000 (01:59 +0000)]
Merge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE" am:
847d965b9e am:
8c42bd3ae4
am:
cab982825c
Change-Id: I1586f98be30f97fc2d759a847875a67fc84d8c56
Dan Willemsen [Sat, 1 Oct 2016 01:52:17 +0000 (01:52 +0000)]
Merge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE" am:
847d965b9e
am:
8c42bd3ae4
Change-Id: I01c6bb2333ac66f266dac5755c73a1ab0f5161d1
Dan Willemsen [Sat, 1 Oct 2016 01:48:46 +0000 (01:48 +0000)]
Merge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE"
am:
847d965b9e
Change-Id: Iab6362844a327f559a5471605ba176e075703a72
Dan Willemsen [Sat, 1 Oct 2016 01:43:37 +0000 (01:43 +0000)]
Merge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE"
Dirk Dougherty [Sat, 1 Oct 2016 01:21:44 +0000 (01:21 +0000)]
For ds builds only, emit a separate metadata file for samples only. am:
a9fcf48078 am:
fd40bbc586 am:
3d58e7f387
am:
77475e522f
Change-Id: Idac070c7a6b866a753c4b292b4c4c28e3be3dce5
Dirk Dougherty [Sat, 1 Oct 2016 01:19:00 +0000 (01:19 +0000)]
For ds builds only, emit a separate metadata file for samples only. am:
a9fcf48078 am:
fd40bbc586
am:
3d58e7f387
Change-Id: Iec35ec96194a76c67dec543cf28184f0d0c2e549
Dirk Dougherty [Sat, 1 Oct 2016 01:11:15 +0000 (01:11 +0000)]
For ds builds only, emit a separate metadata file for samples only. am:
a9fcf48078
am:
913e1dfcd7
Change-Id: I7c6164efec249e50abdc4b032e8f9a47f0ae17eb
Dirk Dougherty [Sat, 1 Oct 2016 01:11:12 +0000 (01:11 +0000)]
For ds builds only, emit a separate metadata file for samples only. am:
a9fcf48078
am:
fd40bbc586
Change-Id: I97c8ecb583d951752218b94dcc88c3f81cf548cd
Dirk Dougherty [Sat, 1 Oct 2016 01:07:42 +0000 (01:07 +0000)]
For ds builds only, emit a separate metadata file for samples only.
am:
a9fcf48078
Change-Id: Ic2b786401a3431896e6441c8c2c61545a6aaea1b
Dirk Dougherty [Sat, 1 Oct 2016 01:07:41 +0000 (01:07 +0000)]
For ds builds only, emit a separate metadata file for samples only.
am:
a9fcf48078
Change-Id: I1795160d80b1038ffe30758ce6fc4cd48d3bda2a
Dirk Dougherty [Sat, 24 Sep 2016 20:39:16 +0000 (13:39 -0700)]
For ds builds only, emit a separate metadata file for samples only.
Change-Id: I95c03a10cca586c6675f98664479ba8bf2e43576
Tao Bao [Sat, 1 Oct 2016 00:24:10 +0000 (00:24 +0000)]
Merge "releasetools: Clean up sign_target_files_apks.py." am:
ad49deb5e6 am:
4299e48f0c
am:
dfc210c9a4
Change-Id: Iee5cda2c10bc9c474140bf1f303261d8cf31d7b8
Tao Bao [Sat, 1 Oct 2016 00:20:39 +0000 (00:20 +0000)]
Merge "releasetools: Clean up sign_target_files_apks.py." am:
ad49deb5e6
am:
4299e48f0c
Change-Id: Ic59f6a2839502c4007f2e5dc51ac4a8eb2477b2d
Tao Bao [Sat, 1 Oct 2016 00:17:08 +0000 (00:17 +0000)]
Merge "releasetools: Clean up sign_target_files_apks.py."
am:
ad49deb5e6
Change-Id: I9ffb1325d349e82bd08b5d0ee99db640a11a36bd
Treehugger Robot [Sat, 1 Oct 2016 00:11:33 +0000 (00:11 +0000)]
Merge "releasetools: Clean up sign_target_files_apks.py."
Chih-Hung Hsieh [Fri, 30 Sep 2016 23:43:10 +0000 (23:43 +0000)]
Merge "Use DEFAULT_EXTERNAL_VENDOR_TIDY_CHECKS for vendor/google_devices" am:
3d38042a00 am:
c3118d2cd2
am:
2a9f96a1ee
Change-Id: I2ececde5410784cc7bb5228ee79dd7de8ed4747f
Chih-Hung Hsieh [Fri, 30 Sep 2016 23:39:36 +0000 (23:39 +0000)]
Merge "Use DEFAULT_EXTERNAL_VENDOR_TIDY_CHECKS for vendor/google_devices" am:
3d38042a00
am:
c3118d2cd2
Change-Id: I699d22bd5cf4593e31a702aa81c98104ab84874a
Chih-Hung Hsieh [Fri, 30 Sep 2016 23:36:05 +0000 (23:36 +0000)]
Merge "Use DEFAULT_EXTERNAL_VENDOR_TIDY_CHECKS for vendor/google_devices"
am:
3d38042a00
Change-Id: I0f25786d7ef6e860093ce7c4760269f77065170a
Treehugger Robot [Fri, 30 Sep 2016 23:25:17 +0000 (23:25 +0000)]
Merge "Use DEFAULT_EXTERNAL_VENDOR_TIDY_CHECKS for vendor/google_devices"
Tao Bao [Fri, 30 Sep 2016 00:53:56 +0000 (17:53 -0700)]
releasetools: Clean up sign_target_files_apks.py.
Remove the obsolete workaround for API 24. Also make it pylint clean.
Test: 1. Sign a target_files.zip and get identical results.
2. `pylint --rcfile=pylintrc sign_target_files_apks.py` gives 10.00/10.
Change-Id: I21736f959c5182486fd8ccebea9bbc594edef9fb
Chih-Hung Hsieh [Fri, 30 Sep 2016 17:41:27 +0000 (10:41 -0700)]
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
Tao Bao [Fri, 30 Sep 2016 17:59:31 +0000 (17:59 +0000)]
Merge "releasetools: Fix the reference to OPTIONS.info_dict." am:
0a5b59e78b am:
8b6d59e110
am:
b00dbd1b11
Change-Id: Ib31adf3e30f4b9077e14c577ffdc5791e89b746b
Tao Bao [Fri, 30 Sep 2016 17:48:38 +0000 (17:48 +0000)]
Merge "releasetools: Fix the reference to OPTIONS.info_dict." am:
0a5b59e78b
am:
8b6d59e110
Change-Id: If2385afbd245654f27a96f02414856a7ce546a00
Tao Bao [Fri, 30 Sep 2016 17:45:50 +0000 (17:45 +0000)]
Merge "releasetools: Fix the reference to OPTIONS.info_dict."
am:
0a5b59e78b
Change-Id: Id4f6669baa861f606d960bc9bb371c6ef728aa36
Tao Bao [Fri, 30 Sep 2016 17:39:22 +0000 (17:39 +0000)]
Merge "releasetools: Fix the reference to OPTIONS.info_dict."
Dan Willemsen [Fri, 30 Sep 2016 05:37:04 +0000 (22:37 -0700)]
Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE
The one user has now been removed, so this is no longer necessary.
Test: None
Change-Id: I8fb9e7b90f664af616368685d81f8b10d0687306
Tao Bao [Fri, 30 Sep 2016 04:59:06 +0000 (21:59 -0700)]
releasetools: Fix the reference to OPTIONS.info_dict.
sign_target_files_apks.py calls common.GetBootableImage() but without
calling 'OPTIONS = common.OPTIONS' first. In common.GetBootableImage(),
we should use the local info_dict parameter instead of OPTIONS.info_dict.
Test: sign_target_files_apks.py generates signed-TF.zip successfully.
Change-Id: Ia3d32b88691c26e5fb98feea709e3e3c3eb70fdb
Dan Willemsen [Fri, 30 Sep 2016 01:48:29 +0000 (01:48 +0000)]
Merge "Add LOCAL_EXPORT_C_INCLUDE_DEPS" am:
1c0b5eaf83 am:
b1fdb9745f
am:
b42e166273
Change-Id: Ib2cb95dcbb64a31f3e33e4fe90d5091914362b03
Dan Willemsen [Fri, 30 Sep 2016 01:46:30 +0000 (01:46 +0000)]
Merge "Add LOCAL_EXPORT_C_INCLUDE_DEPS" am:
1c0b5eaf83
am:
b1fdb9745f
Change-Id: I3388804b77e7125526bf6ea2814bbeb38bbc5f31
Dan Willemsen [Fri, 30 Sep 2016 01:44:00 +0000 (01:44 +0000)]
Merge "Add LOCAL_EXPORT_C_INCLUDE_DEPS"
am:
1c0b5eaf83
Change-Id: I356a040d02e2838fada7ae8472078579b516e8b0
Treehugger Robot [Fri, 30 Sep 2016 01:38:04 +0000 (01:38 +0000)]
Merge "Add LOCAL_EXPORT_C_INCLUDE_DEPS"
Dan Willemsen [Thu, 29 Sep 2016 19:08:29 +0000 (12:08 -0700)]
Add LOCAL_EXPORT_C_INCLUDE_DEPS
This shouldn't be necessary for most makefiles, since we add
$(LOCAL_GENERATED_SOURCES) to this already included, but for prebuilts
that aren't actually prebuilts (Soong modules), we need to pass
dependencies so that the generated headers are built before being used.
Bug:
31742855
Test: Use, inspect build-*.ninja
Change-Id: I8d9f675af639d3f40780d48a016fc079a82531c2
David Zeuthen [Thu, 29 Sep 2016 18:24:30 +0000 (14:24 -0400)]
resolve merge conflicts of
c36ab42 to nyc-mr1-dev-plus-aosp
Change-Id: Iaf78fb6c723955fd92cc64194cb32bba73a9dafb
David Zeuthen [Thu, 29 Sep 2016 18:04:21 +0000 (18:04 +0000)]
Merge "Update for new Android Verified Boot (AVB)." am:
8ee6d119d1
am:
621a3dbf7a
Change-Id: I1e7101853ba81ba21f68b9a72993dc731653692a
David Zeuthen [Thu, 29 Sep 2016 17:59:50 +0000 (17:59 +0000)]
Merge "Update for new Android Verified Boot (AVB)."
am:
8ee6d119d1
Change-Id: I4445455b1b16c6c920c39d7a1d66520eeda385cf
David Zeuthen [Thu, 29 Sep 2016 17:48:40 +0000 (17:48 +0000)]
Merge "Update for new Android Verified Boot (AVB)."
David Zeuthen [Thu, 15 Sep 2016 17:43:54 +0000 (13:43 -0400)]
Update for new Android Verified Boot (AVB).
This updates the build system for the new Android Verified Boot
codebase. As this is based on Brillo Verified Boot, this change replaces
the existing BVB support.
Android Verified Boot is enabled by the BOARD_AVB_ENABLE variable
BOARD_AVB_ENABLE := true
This will make the build system create vbmeta.img which will contain a
hash descriptor for boot.img, a hashtree descriptor for system.img, a
kernel-cmdline descriptor for setting up dm-verity for system.img and
append a hash-tree to system.img.
Additionally, the descriptors are left in boot.img and system.img so a
third party can create their own vbmeta.img file linking - using the
option --chain_partition - to these images. If this is not needed
footers can be erased using the 'avbtool erase_footer' command. It's
also harmless to just leave them in the images.
By default, the algorithm SHA256_RSA4096 is used with a test key from
the AVB source directory. This can be overriden by the
BOARD_AVB_ALGORITHM and BOARD_AVB_KEY_PATH variables to use e.g. a
4096-bit RSA key and SHA-512:
BOARD_AVB_ALGORITHM := SHA512_RSA4096
BOARD_AVB_KEY_PATH := /path/to/rsa_key_4096bits.pem
To prevent rollback attacks, the rollback index should be increased on a
regular basis. The rollback index can be set with the
BOARD_AVB_ROLLBACK_INDEX variable:
BOARD_AVB_ROLLBACK_INDEX := 5
If this is not set, the rollback index defaults to 0.
The variable BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS can be used to specify
additional options passed to 'avbtool make_vbmeta_image'. Typical
options to be used here include '--prop', '--prop_from_file', and
'--chain_partition'.
The variable BOARD_AVBTOOL_BOOT_ADD_HASH_FOOTER_ARGS can be used to
specify additional options passed to 'avbtool add_hash_footer' for
boot.img. Typical options to be used here include '--hash_algorithm' and
'--salt'.
The variable BOARD_AVBTOOL_SYSTEM_ADD_HASHTREE_FOOTER_ARGS can be used
to specify additional options passed to 'avbtool add_hashtree_footer'
for systems.img. Typical options to be used here include
'--hash_algorithm', '--salt', and '--block_size'.
BUG=
31264226
TEST=Manually tested on edison-eng by inspecting {boot, system,
vbmeta}.img in out/ directory as well as their counterparts in
the IMAGES/ directory of edision-target_files-eng.zeuthen.zip
Merged-In: Ic9a61cfc65c148b12996e57f04da5432eef6b982
Change-Id: I97042655bca15e7eac899f12c5bada2f6184d307
Meike Baumgärtner [Thu, 29 Sep 2016 04:19:33 +0000 (04:19 +0000)]
Merge "Only run warn.py's main function if it is the main program." am:
312c310f7c am:
ce4e16d835
am:
8a37ee0c63
Change-Id: I48db2a1358ab5236706217a2c9a14de856854037
Meike Baumgärtner [Thu, 29 Sep 2016 04:11:30 +0000 (04:11 +0000)]
Merge "Only run warn.py's main function if it is the main program." am:
312c310f7c
am:
ce4e16d835
Change-Id: I44973ef0f9ff3f8e1bc641db592b1ac3c96d051a
Meike Baumgärtner [Thu, 29 Sep 2016 04:06:29 +0000 (04:06 +0000)]
Merge "Only run warn.py's main function if it is the main program."
am:
312c310f7c
Change-Id: I4b2c7dce195e62172a81154e261ced167d997ab5
Treehugger Robot [Thu, 29 Sep 2016 03:58:07 +0000 (03:58 +0000)]
Merge "Only run warn.py's main function if it is the main program."
Stephen Hines [Thu, 29 Sep 2016 03:11:59 +0000 (03:11 +0000)]
Merge "Switch to using clang-
3289846." am:
7ec2a39c3f am:
523543b17c
am:
f01330d8df
Change-Id: I4a331773abf1ee7b3fc230f80c973dccbb041340
Stephen Hines [Thu, 29 Sep 2016 03:07:57 +0000 (03:07 +0000)]
Merge "Switch to using clang-
3289846." am:
7ec2a39c3f
am:
523543b17c
Change-Id: Ifa9434cb0ca7ea0f57b436305b72f4d22af5b4b1
Stephen Hines [Thu, 29 Sep 2016 03:03:56 +0000 (03:03 +0000)]
Merge "Switch to using clang-
3289846."
am:
7ec2a39c3f
Change-Id: I67851b34b3c901d8bab93c9ba6f5456eca2aba91
Stephen Hines [Thu, 29 Sep 2016 02:56:49 +0000 (02:56 +0000)]
Merge "Switch to using clang-
3289846."
Meike Baumgärtner [Wed, 28 Sep 2016 17:48:06 +0000 (10:48 -0700)]
Only run warn.py's main function if it is the main program.
Test: run warn.py --byproject build.log
Change-Id: I155cce8c952d6d8a02c8e1809bf61a46c847c26e
Adam Seaton [Wed, 28 Sep 2016 23:59:57 +0000 (23:59 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313 am:
b6621dcce4 am:
34a991851b am:
19f744cb11 am:
e38c8eff17 -s ours am:
f34934a398 am:
bbde7f4d61 am:
b29e4b5072 am:
bf456ce691 am:
c66709e250 am:
eabbc11dac am:
394df97f66
am:
30491f6dff
Change-Id: If0af27a312491c162e57dc4edb71ad0218d04d6b
Adam Seaton [Wed, 28 Sep 2016 23:56:57 +0000 (23:56 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313 am:
b6621dcce4 am:
34a991851b am:
19f744cb11 am:
e38c8eff17 -s ours am:
f34934a398 am:
bbde7f4d61 am:
b29e4b5072 am:
bf456ce691 am:
c66709e250 am:
eabbc11dac
am:
394df97f66
Change-Id: I430746aa4183ad783b206f8d67c93de9b65030de
Adam Seaton [Wed, 28 Sep 2016 23:53:43 +0000 (23:53 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313 am:
b6621dcce4 am:
34a991851b am:
19f744cb11 am:
e38c8eff17 -s ours am:
f34934a398 am:
bbde7f4d61 am:
b29e4b5072 am:
bf456ce691 am:
c66709e250
am:
8676189bfe
Change-Id: Ib1e90b8149743ac13ed952c25cd31d3708d04bca
Adam Seaton [Wed, 28 Sep 2016 23:53:42 +0000 (23:53 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313 am:
b6621dcce4 am:
34a991851b am:
19f744cb11 am:
e38c8eff17 -s ours am:
f34934a398 am:
bbde7f4d61 am:
b29e4b5072 am:
bf456ce691 am:
c66709e250
am:
eabbc11dac
Change-Id: I7386dde56d4eb7069faff4698dd2e41ba03a9973
Adam Seaton [Wed, 28 Sep 2016 23:50:43 +0000 (23:50 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313 am:
b6621dcce4 am:
34a991851b am:
19f744cb11 am:
e38c8eff17 -s ours am:
f34934a398 am:
bbde7f4d61 am:
b29e4b5072 am:
bf456ce691
am:
c66709e250
Change-Id: I7ce273af0c92ff86f021728f776d38429689a268
Adam Seaton [Wed, 28 Sep 2016 23:50:42 +0000 (23:50 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313 am:
b6621dcce4 am:
34a991851b am:
19f744cb11 am:
e38c8eff17 -s ours am:
f34934a398 am:
bbde7f4d61 am:
b29e4b5072 am:
bf456ce691
am:
c66709e250
Change-Id: I69026b9dea389aaf3a81119caaf67f0e1e9e6aeb
Adam Seaton [Wed, 28 Sep 2016 23:47:43 +0000 (23:47 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313 am:
b6621dcce4 am:
34a991851b am:
19f744cb11 am:
e38c8eff17 -s ours am:
f34934a398 am:
bbde7f4d61 am:
b29e4b5072
am:
bf456ce691
Change-Id: I322af25b017e60b81202de28ee03ec0657e4db61
Adam Seaton [Wed, 28 Sep 2016 23:44:12 +0000 (23:44 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313 am:
b6621dcce4 am:
34a991851b am:
19f744cb11 am:
e38c8eff17 -s ours am:
f34934a398 am:
bbde7f4d61
am:
b29e4b5072
Change-Id: Ic2e3c2cae87d0ef219c57ec45fe953ab89a92a27
Adam Seaton [Wed, 28 Sep 2016 23:41:12 +0000 (23:41 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313 am:
b6621dcce4 am:
34a991851b am:
19f744cb11 am:
e38c8eff17 -s ours am:
f34934a398
am:
bbde7f4d61
Change-Id: I2cd175f60442ff8359e17e5a5d6b12407fc0ee93
Adam Seaton [Wed, 28 Sep 2016 23:38:12 +0000 (23:38 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313 am:
b6621dcce4 am:
34a991851b am:
19f744cb11 am:
e38c8eff17 -s ours
am:
f34934a398
Change-Id: Id21149fb75f586dbd8a5bd25eadaf0c76699bd50
Adam Seaton [Wed, 28 Sep 2016 23:35:12 +0000 (23:35 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313 am:
b6621dcce4 am:
34a991851b am:
19f744cb11
am:
e38c8eff17 -s ours
Change-Id: Ie6a3cba97e517bbe4e0e2d3154523dbe8c28ba9d
Tao Bao [Wed, 28 Sep 2016 19:42:59 +0000 (12:42 -0700)]
resolve merge conflicts of
199c0b3 to nyc-mr1-dev-plus-aosp
Change-Id: Icde635bb8efd981f9d14bd2d2d471693ebc0958b
Tao Bao [Wed, 28 Sep 2016 19:37:54 +0000 (19:37 +0000)]
Analyze unchanged blocks in odex files.
am:
d0814585b8
Change-Id: Ie4d6415d4d3ebc1e28a299bd3bb0150262a07535
Chih-Hung Hsieh [Wed, 28 Sep 2016 18:00:50 +0000 (18:00 +0000)]
Merge "Fix pylint warning and refactor project_list." am:
6784a3fcdd am:
ac2df1c205
am:
62c9956819
Change-Id: I9171de8c9062b93de102ae782345d93da6892598
Chih-Hung Hsieh [Wed, 28 Sep 2016 17:57:47 +0000 (17:57 +0000)]
Merge "Fix pylint warning and refactor project_list." am:
6784a3fcdd
am:
ac2df1c205
Change-Id: I7f2017a50ab5b5aee425e86211e0746538e94e90
Chih-Hung Hsieh [Wed, 28 Sep 2016 17:54:47 +0000 (17:54 +0000)]
Merge "Fix pylint warning and refactor project_list."
am:
6784a3fcdd
Change-Id: I6ddc536af0c9ebf735ed14032d98880ed4f2175b
OSDN Git Service
