Commit Graph

31880 Commits

Author SHA1 Message Date
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
Dirk Dougherty
7e9cccdfba For ds builds only, emit a separate metadata file for samples only. am: a9fcf48078
am: 913e1dfcd7

Change-Id: I7c6164efec249e50abdc4b032e8f9a47f0ae17eb
2016-10-01 01:11:15 +00:00
Dirk Dougherty
3d58e7f387 For ds builds only, emit a separate metadata file for samples only. am: a9fcf48078
am: fd40bbc586

Change-Id: I97c8ecb583d951752218b94dcc88c3f81cf548cd
2016-10-01 01:11:12 +00:00
Dirk Dougherty
913e1dfcd7 For ds builds only, emit a separate metadata file for samples only.
am: a9fcf48078

Change-Id: Ic2b786401a3431896e6441c8c2c61545a6aaea1b
2016-10-01 01:07:42 +00:00
Dirk Dougherty
fd40bbc586 For ds builds only, emit a separate metadata file for samples only.
am: a9fcf48078

Change-Id: I1795160d80b1038ffe30758ce6fc4cd48d3bda2a
2016-10-01 01:07:41 +00:00
Dirk Dougherty
a9fcf48078 For ds builds only, emit a separate metadata file for samples only.
Change-Id: I95c03a10cca586c6675f98664479ba8bf2e43576
2016-09-30 17:33:50 -07:00
Tao Bao
658af49662 Merge "releasetools: Clean up sign_target_files_apks.py." am: ad49deb5e6 am: 4299e48f0c
am: dfc210c9a4

Change-Id: Iee5cda2c10bc9c474140bf1f303261d8cf31d7b8
2016-10-01 00:24:10 +00:00
Tao Bao
dfc210c9a4 Merge "releasetools: Clean up sign_target_files_apks.py." am: ad49deb5e6
am: 4299e48f0c

Change-Id: Ic59f6a2839502c4007f2e5dc51ac4a8eb2477b2d
2016-10-01 00:20:39 +00:00
Tao Bao
4299e48f0c Merge "releasetools: Clean up sign_target_files_apks.py."
am: ad49deb5e6

Change-Id: I9ffb1325d349e82bd08b5d0ee99db640a11a36bd
2016-10-01 00:17:08 +00:00
Treehugger Robot
ad49deb5e6 Merge "releasetools: Clean up sign_target_files_apks.py." 2016-10-01 00:11:33 +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
Chih-Hung Hsieh
c3118d2cd2 Merge "Use DEFAULT_EXTERNAL_VENDOR_TIDY_CHECKS for vendor/google_devices"
am: 3d38042a00

Change-Id: I0f25786d7ef6e860093ce7c4760269f77065170a
2016-09-30 23:36:05 +00:00
Treehugger Robot
3d38042a00 Merge "Use DEFAULT_EXTERNAL_VENDOR_TIDY_CHECKS for vendor/google_devices" 2016-09-30 23:25:17 +00:00
Tao Bao
9aa4b9b1b6 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
2016-09-30 15:29:09 -07: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
Tao Bao
8145c70f2b Merge "releasetools: Fix the reference to OPTIONS.info_dict." am: 0a5b59e78b am: 8b6d59e110
am: b00dbd1b11

Change-Id: Ib31adf3e30f4b9077e14c577ffdc5791e89b746b
2016-09-30 17:59:31 +00:00
Tao Bao
b00dbd1b11 Merge "releasetools: Fix the reference to OPTIONS.info_dict." am: 0a5b59e78b
am: 8b6d59e110

Change-Id: If2385afbd245654f27a96f02414856a7ce546a00
2016-09-30 17:48:38 +00:00
Tao Bao
8b6d59e110 Merge "releasetools: Fix the reference to OPTIONS.info_dict."
am: 0a5b59e78b

Change-Id: Id4f6669baa861f606d960bc9bb371c6ef728aa36
2016-09-30 17:45:50 +00:00
Tao Bao
0a5b59e78b Merge "releasetools: Fix the reference to OPTIONS.info_dict." 2016-09-30 17:39:22 +00:00
Dan Willemsen
3aa39a4903 Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE
The one user has now been removed, so this is no longer necessary.

Test: None
Change-Id: I8fb9e7b90f664af616368685d81f8b10d0687306
2016-09-29 22:37:04 -07:00
Tao Bao
b31b94e159 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
2016-09-29 22:04:50 -07:00
Dan Willemsen
a7d2992ba3 Merge "Add LOCAL_EXPORT_C_INCLUDE_DEPS" am: 1c0b5eaf83 am: b1fdb9745f
am: b42e166273

Change-Id: Ib2cb95dcbb64a31f3e33e4fe90d5091914362b03
2016-09-30 01:48:29 +00:00
Dan Willemsen
b42e166273 Merge "Add LOCAL_EXPORT_C_INCLUDE_DEPS" am: 1c0b5eaf83
am: b1fdb9745f

Change-Id: I3388804b77e7125526bf6ea2814bbeb38bbc5f31
2016-09-30 01:46:30 +00:00
Dan Willemsen
b1fdb9745f Merge "Add LOCAL_EXPORT_C_INCLUDE_DEPS"
am: 1c0b5eaf83

Change-Id: I356a040d02e2838fada7ae8472078579b516e8b0
2016-09-30 01:44:00 +00:00
Treehugger Robot
1c0b5eaf83 Merge "Add LOCAL_EXPORT_C_INCLUDE_DEPS" 2016-09-30 01:38:04 +00:00
Dan Willemsen
ba6a164da7 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
2016-09-29 12:08:29 -07:00
David Zeuthen
27ac0e34fe resolve merge conflicts of c36ab42 to nyc-mr1-dev-plus-aosp
Change-Id: Iaf78fb6c723955fd92cc64194cb32bba73a9dafb
2016-09-29 14:25:03 -04:00
David Zeuthen
c36ab42dcc Merge "Update for new Android Verified Boot (AVB)." am: 8ee6d119d1
am: 621a3dbf7a

Change-Id: I1e7101853ba81ba21f68b9a72993dc731653692a
2016-09-29 18:04:21 +00:00
David Zeuthen
621a3dbf7a Merge "Update for new Android Verified Boot (AVB)."
am: 8ee6d119d1

Change-Id: I4445455b1b16c6c920c39d7a1d66520eeda385cf
2016-09-29 17:59:50 +00:00
David Zeuthen
8ee6d119d1 Merge "Update for new Android Verified Boot (AVB)." 2016-09-29 17:48:40 +00:00
David Zeuthen
2ce63edab7 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
2016-09-29 11:19:36 -04:00
Meike Baumgärtner
dc7706a8ad Merge "Only run warn.py's main function if it is the main program." am: 312c310f7c am: ce4e16d835
am: 8a37ee0c63

Change-Id: I48db2a1358ab5236706217a2c9a14de856854037
2016-09-29 04:19:33 +00:00
Meike Baumgärtner
8a37ee0c63 Merge "Only run warn.py's main function if it is the main program." am: 312c310f7c
am: ce4e16d835

Change-Id: I44973ef0f9ff3f8e1bc641db592b1ac3c96d051a
2016-09-29 04:11:30 +00:00
Meike Baumgärtner
ce4e16d835 Merge "Only run warn.py's main function if it is the main program."
am: 312c310f7c

Change-Id: I4b2c7dce195e62172a81154e261ced167d997ab5
2016-09-29 04:06:29 +00:00
Treehugger Robot
312c310f7c Merge "Only run warn.py's main function if it is the main program." 2016-09-29 03:58:07 +00:00
Stephen Hines
6ac9550c6a Merge "Switch to using clang-3289846." am: 7ec2a39c3f am: 523543b17c
am: f01330d8df

Change-Id: I4a331773abf1ee7b3fc230f80c973dccbb041340
2016-09-29 03:11:59 +00:00
Stephen Hines
f01330d8df Merge "Switch to using clang-3289846." am: 7ec2a39c3f
am: 523543b17c

Change-Id: Ifa9434cb0ca7ea0f57b436305b72f4d22af5b4b1
2016-09-29 03:07:57 +00:00
Stephen Hines
523543b17c Merge "Switch to using clang-3289846."
am: 7ec2a39c3f

Change-Id: I67851b34b3c901d8bab93c9ba6f5456eca2aba91
2016-09-29 03:03:56 +00:00
Stephen Hines
7ec2a39c3f Merge "Switch to using clang-3289846." 2016-09-29 02:56:50 +00:00
Meike Baumgärtner
ac9d5df349 Only run warn.py's main function if it is the main program.
Test: run warn.py --byproject build.log
Change-Id: I155cce8c952d6d8a02c8e1809bf61a46c847c26e
2016-09-28 17:59:08 -07:00
Adam Seaton
36ef3f227d 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
2016-09-28 23:59:57 +00:00
Adam Seaton
30491f6dff 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
2016-09-28 23:56:57 +00:00
Adam Seaton
ce3b7271fd 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
2016-09-28 23:53:43 +00:00
Adam Seaton
394df97f66 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
2016-09-28 23:53:42 +00:00