Commit Graph

10848 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Dan Willemsen
3594cee467 link_type check: Support modules installed into /data
Test: compare build.ninja before/after, look at warnings.html
Change-Id: I1b78748dd80b73d2601b2adf0aaac8a6b2b350d5
2016-09-22 13:05:02 -07:00
Yohann Roussel
cbe1913c78 Fix bad JACK_PLUGIN variable am: 16243bdbec
am: fa887390aa

Change-Id: I50ffe581aa848fd1b1fe3109eacd19dce4049632
2016-09-22 11:46:09 +00:00
Yohann Roussel
62e67d1bff Add support for Jack plugin am: 53b7fbbe78
am: be50693fc1

Change-Id: I67172f4e42cca74f793426912cc8b0ff036bf47c
2016-09-22 11:46:01 +00:00
Yohann Roussel
fa887390aa Fix bad JACK_PLUGIN variable
am: 16243bdbec

Change-Id: Ic0c8dfc081ce1bc0a267474bf1ce7d3ca3dfbb03
2016-09-22 09:41:30 +00:00
Yohann Roussel
be50693fc1 Add support for Jack plugin
am: 53b7fbbe78

Change-Id: Idec54986c0afe10973c464c6edb533321441eea7
2016-09-22 09:41:22 +00:00
Benoit Lamarche
52eafee87a Merge changes from topic 'jack-d-b3-as-stable'
* changes:
  Fix bad JACK_PLUGIN variable
  Add support for Jack plugin
2016-09-22 09:34:27 +00:00
Dan Willemsen
f56a3b2513 Merge "Package up proguard jack_dictionary" am: f7d1a6d75f
am: e875b39791

Change-Id: Ibe68192917534f603872e698131534e55973edae
2016-09-21 19:50:50 +00:00
Dan Willemsen
f7d1a6d75f Merge "Package up proguard jack_dictionary" 2016-09-21 19:39:47 +00:00
Adam Seaton
8f911960cf Updating security string to 2016-11-05 on nyc-dev
am: 002132648d

Change-Id: I00ffcb925f579ad2e404dafeaa2d85cf76e021f3
2016-09-21 17:55:18 +00:00
Adam Seaton
f305906a95 Updating Security String to 2016-11-01 on nyc-dev
am: 2a00b24144

Change-Id: I19a783b2e608de9b3be07f442a9762336f2105c1
2016-09-21 17:51:40 +00:00
Yohann Roussel
16243bdbec Fix bad JACK_PLUGIN variable
Changed to LOCAL_JACK_PLUGIN.

(cherry picked from commit 17924b136cb5bfc60d138e8c7e5c18a90b5965c3)

Test: Manually tested by some manual activations of the coverage plugin.
Change-Id: I1be4aaa502103fc308d35a5672dc4fe5900c4ebe
2016-09-21 10:54:42 +02:00
Yohann Roussel
53b7fbbe78 Add support for Jack plugin
And ensure compatibility with coverage plugin.

(cherry picked from commit 862bb84d37e3e6ca61080de58f206e512e09d4e0)

Bug: 28876950
Test: Manually tested by some manual activations of the coverage plugin.
Change-Id: I804558a501825357bf0812de626d2957eedbdc13
2016-09-21 10:53:45 +02:00
Colin Cross
1f351ad75c Merge "Replace usages of my_register_name with my_all_targets" am: 077d9d5fe7
am: e373117cac

Change-Id: I4636a410ec035c21fc20c04f47cada7b08c31b8e
2016-09-21 02:09:54 +00:00
Colin Cross
3388670e78 Replace usages of my_register_name with my_all_targets
A few module types add extra dependencies on $(my_register_name), move
them to $(my_all_targets) so that they are built for mm and mma too.

Bug: 31526036
Test: mmm framework
Change-Id: I2e594ce771451a99691739b963f4ce517e9dd595
2016-09-20 16:03:50 -07:00
Adam Seaton
002132648d Updating security string to 2016-11-05 on nyc-dev
b/31618336

Change-Id: I1489eaf64c59dc0f175eb9220a900c68e262b3dd
2016-09-20 15:48:41 -07:00
Adam Seaton
2a00b24144 Updating Security String to 2016-11-01 on nyc-dev
b/31618336

Change-Id: I8ee8f978fbbf30efb1abca85cf374fc440a1baf7
2016-09-20 15:47:16 -07:00
Dan Willemsen
b6c061e9ff Package up proguard jack_dictionary
Bug: 31182185
Test: m dist in an unbundled branch
Change-Id: I7ee1ba076cfa03f294f8231f6bdd8fa8df5557af
2016-09-20 14:21:53 -07:00
Paul Duffin
d8d5065b50 Merge "Add targets for building individual modules using javac" am: cb6f7c2d86
am: da3fdebc1d

Change-Id: Iff02ac85b5e197135a9729e725a55cb5715cc2a8
2016-09-20 11:59:48 +00:00
Paul Duffin
cb6f7c2d86 Merge "Add targets for building individual modules using javac" 2016-09-20 11:51:40 +00:00
Dan Willemsen
8459bbca6f Merge "Fix link_type checking" am: 665cda08f0
am: 1347d959de

Change-Id: Ia7ba9accbfa4c7de8843d5554a62524500509d5b
2016-09-19 23:21:16 +00:00
Dan Willemsen
665cda08f0 Merge "Fix link_type checking" 2016-09-19 21:54:09 +00:00
Paul Duffin
32bd0adf9c Add targets for building individual modules using javac
This is needed in order to be able to run error prone (which is
a plugin replacement for javac) on a subset of the java code.

Bug: 31507496
Test: Build javac-check-core-tests and check the resulting JAR
Change-Id: I5a556920572fcdad7b39d67e3f00fe0e0f1f8f46
2016-09-19 13:38:51 +01:00
Dan Willemsen
8e77f86d58 Merge "Only update previous product config when changed" am: 2fcacb5a22
am: 5f381cfcb2

Change-Id: I77598bb8449c8b4b83e93453dd46a658af66bab1
2016-09-17 02:38:49 +00:00