Commit Graph

31863 Commits

Author SHA1 Message Date
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
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
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
Adam Seaton 8676189bfe 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
2016-09-28 23:50:43 +00:00
Adam Seaton eabbc11dac 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
2016-09-28 23:50:42 +00:00
Adam Seaton c66709e250 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
2016-09-28 23:47:43 +00:00
Adam Seaton bf456ce691 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
2016-09-28 23:44:12 +00:00
Adam Seaton b29e4b5072 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
2016-09-28 23:41:12 +00:00
Adam Seaton bbde7f4d61 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
2016-09-28 23:38:12 +00:00
Adam Seaton f34934a398 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
2016-09-28 23:35:12 +00:00
Tao Bao 2131dcf9f6 resolve merge conflicts of 199c0b3 to nyc-mr1-dev-plus-aosp
Change-Id: Icde635bb8efd981f9d14bd2d2d471693ebc0958b
2016-09-28 12:42:59 -07:00
Tao Bao 199c0b3948 Analyze unchanged blocks in odex files.
am: d0814585b8

Change-Id: Ie4d6415d4d3ebc1e28a299bd3bb0150262a07535
2016-09-28 19:37:54 +00:00
Chih-Hung Hsieh 882737b7cb Merge "Fix pylint warning and refactor project_list." am: 6784a3fcdd am: ac2df1c205
am: 62c9956819

Change-Id: I9171de8c9062b93de102ae782345d93da6892598
2016-09-28 18:00:50 +00:00
Chih-Hung Hsieh 62c9956819 Merge "Fix pylint warning and refactor project_list." am: 6784a3fcdd
am: ac2df1c205

Change-Id: I7f2017a50ab5b5aee425e86211e0746538e94e90
2016-09-28 17:57:47 +00:00
Chih-Hung Hsieh ac2df1c205 Merge "Fix pylint warning and refactor project_list."
am: 6784a3fcdd

Change-Id: I6ddc536af0c9ebf735ed14032d98880ed4f2175b
2016-09-28 17:54:47 +00:00
Treehugger Robot 6784a3fcdd Merge "Fix pylint warning and refactor project_list." 2016-09-28 17:47:41 +00:00
Tao Bao 7f5f23160d Merge "Analyze unchanged blocks in odex files." am: 6e12b72966 am: 0493339a1f
am: 4fbdde5150

Change-Id: Ibbd1b92b81249b7f11de1ba166ff04ee7ba73b88
2016-09-28 17:18:15 +00:00
Tao Bao 4fbdde5150 Merge "Analyze unchanged blocks in odex files." am: 6e12b72966
am: 0493339a1f

Change-Id: Icfdd5a0f02f43fdca2adf6468b106fcd403614bc
2016-09-28 17:15:45 +00:00
Tao Bao d0814585b8 Analyze unchanged blocks in odex files.
In BBOTA, we generate patches based on _all_ the blocks of a pair of
input files (src and tgt). For security incremental OTAs, one common
pattern is that only a few blocks are changed in odex files (e.g.
headers). We don't really need to stash/patch the unchanged blocks.

This CL analyzes the unchanged blocks in odex files and computes the
diff for the changed blocks only. It reduces the OTA install time by
about 25% to 40% in our experiments, by paying an increase of 5% to 30%
OTA generation time cost.

Bug: 31570716
Test: Generate an incremental and apply on device.

Change-Id: If842c1afeff6894a3d27eb60b7e8f65a179b7977
(cherry picked from commit 08c8583aea)
2016-09-28 10:13:33 -07:00
Tao Bao 0493339a1f Merge "Analyze unchanged blocks in odex files."
am: 6e12b72966

Change-Id: Ic99c7293f6887ee8a4e3ad4e66ca9140e7dbeba9
2016-09-28 17:13:14 +00:00