Commit Graph

11571 Commits

Author SHA1 Message Date
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
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
Dan Willemsen
a5fa6ca7fa Merge "Add LOCAL_EXPORT_C_INCLUDE_DEPS" am: 1c0b5eaf83 am: b1fdb9745f am: b42e166273
am: a7d2992ba3

Change-Id: I4011f484aa2295a7cd42d161370bb4374ed91c58
2016-09-30 01:52:46 +00: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
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
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
David Zeuthen
01f808de49 Merge "Update for new Android Verified Boot (AVB)." 2016-09-29 15:18:56 +00:00
Stephen Hines
83dd356704 Merge "Switch to using clang-3289846." am: 7ec2a39c3f am: 523543b17c am: f01330d8df
am: 6ac9550c6a

Change-Id: I4159bec7fd9bb68d4d7f266d098c9fca17130fcd
2016-09-29 03:28:40 +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
David Zeuthen
0eb1097dd3 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: aosp_x86_64-eng 'm' and 'm dist' successful.

Change-Id: Ic9a61cfc65c148b12996e57f04da5432eef6b982
2016-09-28 18:55:41 -04:00
Stephen Hines
183b142ac9 Switch to using clang-3289846.
Bug: http://b/30252254
Test: Built/boot platform using latest prebuilts.
Change-Id: I7c9357a99afec323fd766e93b5d5e941e9e06244
2016-09-28 08:51:55 -07:00
Dan Willemsen
2d254448ce Merge "Remove WITH_SYNTAX_CHECK" am: c114bd9dbf am: d640e062e8 am: 28d50c498b
am: a4c82e7b3a

Change-Id: I7f15e1ff7949a0061a387b84000811611e3aa266
2016-09-28 02:00:53 +00:00
Dan Willemsen
a4c82e7b3a Merge "Remove WITH_SYNTAX_CHECK" am: c114bd9dbf am: d640e062e8
am: 28d50c498b

Change-Id: I335a3b87e3e7e75be9b2a2c2031388609d69c057
2016-09-28 01:57:47 +00:00
Dan Willemsen
28d50c498b Merge "Remove WITH_SYNTAX_CHECK" am: c114bd9dbf
am: d640e062e8

Change-Id: Ia808c46ce1089210eaa5db02b446cfca0ed5cdde
2016-09-28 01:55:17 +00:00
Treehugger Robot
c114bd9dbf Merge "Remove WITH_SYNTAX_CHECK" 2016-09-28 01:44:24 +00:00
Evgenii Stepanov
73c7a886e4 Merge "Enable LOCAL_SANITIZE:=cfi and add LOCAL_SANITIZE_DIAG." am: 2358c55d70 am: 04b11c5acd am: 9eddd0620c
am: c14977f30b

Change-Id: I437e67c919454dda90bfdfcb69a51c949e35d8d8
2016-09-27 21:14:57 +00:00
Evgenii Stepanov
c14977f30b Merge "Enable LOCAL_SANITIZE:=cfi and add LOCAL_SANITIZE_DIAG." am: 2358c55d70 am: 04b11c5acd
am: 9eddd0620c

Change-Id: I06999b22af259785258e6b198c439c3538023f6a
2016-09-27 21:04:26 +00:00
Evgenii Stepanov
9eddd0620c Merge "Enable LOCAL_SANITIZE:=cfi and add LOCAL_SANITIZE_DIAG." am: 2358c55d70
am: 04b11c5acd

Change-Id: Iafb3730cc96056b09e26fa95e9bf9e73588d4315
2016-09-27 21:01:26 +00:00
Evgenii Stepanov
2358c55d70 Merge "Enable LOCAL_SANITIZE:=cfi and add LOCAL_SANITIZE_DIAG." 2016-09-27 20:51:41 +00:00
Dan Willemsen
a802bf5714 Merge "Remove spaces from DEFAULT_TIDY_HEADER_DIRS" am: f69e48b30b am: 785d69a849 am: b4b610278b
am: 28666571b4

Change-Id: Ia50c9f7b042e8494ec2a4509159a5591949e5a11
2016-09-27 01:31:24 +00:00
Dan Willemsen
28666571b4 Merge "Remove spaces from DEFAULT_TIDY_HEADER_DIRS" am: f69e48b30b am: 785d69a849
am: b4b610278b

Change-Id: Ia2891d68f9c20af23fb7ab4a0014a8c74104cfad
2016-09-27 01:27:11 +00:00
Dan Willemsen
b4b610278b Merge "Remove spaces from DEFAULT_TIDY_HEADER_DIRS" am: f69e48b30b
am: 785d69a849

Change-Id: I5362a422641f40c3472d3a7506cc8a6354b8a09a
2016-09-27 01:24:11 +00:00
Dan Willemsen
e68100e8bb Remove WITH_SYNTAX_CHECK
It's no longer used. The majority of the platform is on clang anyways.

Test: m -j
Change-Id: I4fb4375eaad2469e169d34c47ae3fe2a0540aeec
2016-09-26 17:37:19 -07:00
Dan Willemsen
69811f89d6 Remove spaces from DEFAULT_TIDY_HEADER_DIRS
I'm preparing to move this to Soong, and it's simpler to compare if the
spaces are removed here (to match the other lists in this file).

Test: WITH_TIDY=true; compare build.ninja before and after change
Change-Id: Ib27a19a36ebb1132300a8c1eeace1202685dfc4c
2016-09-26 16:02:15 -07:00
Dan Willemsen
950266effc link_type check: Support modules installed into /data am: 3594cee467 am: 16448d0b27 am: 3888162616
am: d3a6a04324

Change-Id: I07635c6d3aa4252dbdc6b2dd05cb58aa0a2f0ca3
2016-09-23 04:43:41 +00:00
Dan Willemsen
d3a6a04324 link_type check: Support modules installed into /data am: 3594cee467 am: 16448d0b27
am: 3888162616

Change-Id: I9ed0dd964a51d4b2c5be4ccff2e7191160a73644
2016-09-23 04:38:41 +00:00
Dan Willemsen
3888162616 link_type check: Support modules installed into /data am: 3594cee467
am: 16448d0b27

Change-Id: If1fc6d6d584dd5b58b2a8b84ad7e819d4d6d127b
2016-09-23 04:37:11 +00:00
Dan Willemsen
16448d0b27 link_type check: Support modules installed into /data
am: 3594cee467

Change-Id: I3735c05d317aa5c125471c7e91124cd45ebe4a98
2016-09-23 04:35:13 +00:00
Treehugger Robot
8870658397 Merge "link_type check: Support modules installed into /data" 2016-09-23 04:30:02 +00:00
Dan Willemsen
9f98f14ee9 Merge "Pass userdebug/eng variant to Soong" am: 19f24492db am: 7ebc69e881 am: 2ffe3d83fe
am: f786cd465f

Change-Id: Ib6d4d8c03b8e6f4774ce79721589485dd95cdb64
2016-09-23 01:24:13 +00:00
Dan Willemsen
f786cd465f Merge "Pass userdebug/eng variant to Soong" am: 19f24492db am: 7ebc69e881
am: 2ffe3d83fe

Change-Id: I244dccec37fc00e5f1a3473de332dfeb0e4d8758
2016-09-23 00:25:14 +00:00
Dan Willemsen
2ffe3d83fe Merge "Pass userdebug/eng variant to Soong" am: 19f24492db
am: 7ebc69e881

Change-Id: Ib3524a0f7e8634164ab77a10873f0e3afb4e47f1
2016-09-23 00:23:17 +00:00
Treehugger Robot
19f24492db Merge "Pass userdebug/eng variant to Soong" 2016-09-23 00:16:52 +00:00
Yohann Roussel
05485ef265 Fix bad JACK_PLUGIN variable am: 16243bdbec am: fa887390aa am: cbe1913c78
am: d52aacb821

Change-Id: I79d8299d4a4b81567a3f4d3b564bbb8813571bbd
2016-09-23 00:09:17 +00:00
Yohann Roussel
646f2121be Add support for Jack plugin am: 53b7fbbe78 am: be50693fc1 am: 62e67d1bff
am: cf65679d9e

Change-Id: I341b3b1708589999bba3bb3d5c49a37f5747dcd0
2016-09-23 00:09:08 +00:00
Dan Willemsen
f2649570c5 Pass userdebug/eng variant to Soong
Test: Run build with eng/userdebug/user and check the soong.variables
Change-Id: I7cd71a94e92526b6cc61303b13b7bc593cbbfc3a
2016-09-22 15:22:48 -07:00