Commit Graph

34615 Commits

Author SHA1 Message Date
Dan Willemsen e834d5f059 Merge "Rewrite link type checking" am: e4d92ef568
am: d76aaed983

Change-Id: I04cb85e8062374b9eee87806e3187b49768cf908
2017-04-20 15:12:48 +00:00
Dan Willemsen d76aaed983 Merge "Rewrite link type checking"
am: e4d92ef568

Change-Id: Iba88d5113ef0ce9321fb98057261323ec160d6a9
2017-04-20 15:10:18 +00:00
Dan Willemsen e4d92ef568 Merge "Rewrite link type checking" 2017-04-20 15:04:08 +00:00
Dan Willemsen b47d4e9cf1 Rewrite link type checking
All the new features are turned off for now, since multiple branches and
products need to be verified before they can be turned on. So everything
should behave the same as today, except for no partition-based
warnings.

Instead of the current link type checks that happen during the build,
run as many as possible immediately after loading all the Android.mk
files. If we're allowing missing dependencies ('mm',
ALLOW_MISSING_DEPENDENCIES, tapas, etc), we'll defer the link type
checks to during the build. If we're not allowing missing dependencies,
we'll produce a better error message to the user about the missing
dependencies.

See core/main.mk for a description of the storage format.

This also remove the partition-based type checking. It hasn't worked all
that well, particularly with ASAN builds. The new VNDK checks will
handle the most pressing cases.

Test: Verify all link_type files and dependencies are the same:
  grep link_type: out/build-aosp_arm64.ninja | sed -E "s/ rule[0-9]+//" | sort
Change-Id: Id643658b9d9e84f99f5db0d526aad88c1f5d3417
2017-04-19 22:41:32 -07:00
Vishwath Mohan bb68c9e60a Merge "Change the global CFI flag to default to enabled." am: eddf74cadb
am: 69a345338a

Change-Id: Ic67b7e76b5a4ee8b3342ef020d0c5cd16318a70e
2017-04-20 01:47:04 +00:00
Vishwath Mohan ee5e53ccc5 Merge "Change the global CFI flag to default to enabled." am: 45fd769588
am: 6e790c6a49

Change-Id: I45ee0c70c776576604fdf554a932574d1893bea9
2017-04-20 01:46:55 +00:00
Vishwath Mohan 69a345338a Merge "Change the global CFI flag to default to enabled."
am: eddf74cadb

Change-Id: I1f954ebfd9b948a554f994840bce7e33563219b3
2017-04-20 01:44:59 +00:00
Vishwath Mohan 6e790c6a49 Merge "Change the global CFI flag to default to enabled."
am: 45fd769588

Change-Id: I89f1efa7c08a1e4fc3df2987948b3965497b35c3
2017-04-20 01:44:53 +00:00
Vishwath Mohan eddf74cadb Merge "Change the global CFI flag to default to enabled." 2017-04-20 01:39:56 +00:00
Vishwath Mohan 45fd769588 Merge "Change the global CFI flag to default to enabled." 2017-04-20 01:39:56 +00:00
Colin Cross 2f1488ae86 Merge "Filter and colorize javac output V3" am: c8387929d1
am: f4ef1db272

Change-Id: I5f311894a553df99c0a77671d60dcc24250fcdb7
2017-04-18 23:08:25 +00:00
Colin Cross f4ef1db272 Merge "Filter and colorize javac output V3"
am: c8387929d1

Change-Id: I6c3e196f4b3c38963b106df28e7f1ec2761a17d7
2017-04-18 23:03:27 +00:00
Treehugger Robot c8387929d1 Merge "Filter and colorize javac output V3" 2017-04-18 22:53:46 +00:00
Colin Cross 5f89212e24 Filter and colorize javac output V3
Add soong_javac_wrapper to all javac commands. soong_javac_wrapper
colorizes javac output, and hides noisy messages.

Previously attempted in I7e8fcd2e4e1ed3ff530a8ccfe931ceb7e411e0ad
and I449a61ed2c95b3e1afd51a31a11baab15d97e2f2.

Test: m -j ANDROID_COMPILE_WITH_JACK=false
Change-Id: I9d7a20d766fadab323a4cf95e5734741b3f578bb
2017-04-18 21:04:58 +00:00
Vishwath Mohan 648a3380e2 Merge "Make PIC/PIE levels compatible for LTO." am: 4be1d8823e
am: dc8469e858

Change-Id: I67e094ceff60ff01fa8636ca94d1dd0c19728256
2017-04-18 02:01:37 +00:00
Vishwath Mohan dc8469e858 Merge "Make PIC/PIE levels compatible for LTO."
am: 4be1d8823e

Change-Id: I3e7409da1f9d570077693834b941979e1ffa6f5b
2017-04-18 01:56:36 +00:00
Treehugger Robot 4be1d8823e Merge "Make PIC/PIE levels compatible for LTO." 2017-04-18 01:48:59 +00:00
Vishwath Mohan c3b255622d Make PIC/PIE levels compatible for LTO.
The build system currently uses -fPIC for position independent
libraries, and -fpie for position independent executables. However,
these levels are incompatible and conflict when an executable includes
a static lib with the -fPIC flag - such as when building with
LTO. This CL changes the flag for executables to the compatible -fPIE
instead, which is equivalent for all architectures except PowerPC.

Bug: 30227045
Test: ENABLE_CFI=true m -j40 checkbuild # builds and boots
Change-Id: Ieb20bc2528300d88ff05e8787c5840ab6f03fb38
2017-04-17 16:16:33 -07:00
Colin Cross 4f62b45b0f Merge "Set PRIVATE_PREFIX when using $(transform-prebuilt-to-target)" am: 04e4fd3071
am: 418571baf2

Change-Id: Iefa70482ddc2dd00992806cd00dbd24cbc1898be
2017-04-17 18:44:08 +00:00
Colin Cross 418571baf2 Merge "Set PRIVATE_PREFIX when using $(transform-prebuilt-to-target)"
am: 04e4fd3071

Change-Id: Icf2f285ef47e80b31efb8f04bbde1d457fa5c048
2017-04-17 18:39:37 +00:00
Colin Cross 04e4fd3071 Merge "Set PRIVATE_PREFIX when using $(transform-prebuilt-to-target)" 2017-04-17 18:31:01 +00:00
Bowgo Tsai 13de7b5f0b Merge changes Ieb58dd9a,I8ada38df am: 9ea5c1aad0
am: 225a18d07d

Change-Id: I3b29829e64aca4d9dc5b04e1f3b5b4b49a6d0eb8
2017-04-15 05:44:26 +00:00
Bowgo Tsai 225a18d07d Merge changes Ieb58dd9a,I8ada38df
am: 9ea5c1aad0

Change-Id: I8999475abae84b2f7bc1019da702c1e7db1f6628
2017-04-15 05:41:29 +00:00
Bowgo Tsai 9ea5c1aad0 Merge changes Ieb58dd9a,I8ada38df
* changes:
  AVB: support BOARD_BUILD_SYSTEM_ROOT_IMAGE
  AVB: support signing vendor.img
2017-04-15 05:36:59 +00:00
Bowgo Tsai 9b3776017f AVB: support BOARD_BUILD_SYSTEM_ROOT_IMAGE
Passing --setup_rootfs_from_kernel to avbtool when
BOARD_BUILD_SYSTEM_ROOT_IMAGE is true

Bug: 33590159
Test: 'make' sailfish with BOARD_AVB_ENABLE := true
Test: 'make dist' with BOARD_AVB_ENABLE := true
Change-Id: Ieb58dd9ae6be1eceb90a33c739b85cff5cbc6e0a
2017-04-15 08:53:40 +08:00
Bowgo Tsai 8ee4a3db8c AVB: support signing vendor.img
Uses avbtool to sign vendor.img if BOARD_AVB_ENABLE is set.
It also allows appending additional arguments to avbtool via
BOARD_AVB_VENDOR_ADD_HASHTREE_FOOTER_ARGS.

e.g.,
  BOARD_AVB_ENABLE := true
  BOARD_AVB_VENDOR_ADD_HASHTREE_FOOTER_ARGS := --generate_fec

Bug: 35415839
Test: "make" with the above variables and use avbtool to check vbmeta is
      appended to vendor.img
Test: "make dist" with the above variables

Change-Id: I8ada38dff3def6d34613e77c67944def8a49f464
2017-04-15 08:53:06 +08:00
Dan Willemsen e78154614c Merge "Overridden packages shouldn't install vdex files either" am: 01f4e20172
am: 5a8b1617ae

Change-Id: I6176a2faa24be301a6e1459691e17e598b29a204
2017-04-15 00:03:02 +00:00
Dan Willemsen 5a8b1617ae Merge "Overridden packages shouldn't install vdex files either"
am: 01f4e20172

Change-Id: Ie96f6c6a82b28cf12fd61c39a1541a57e83beb0a
2017-04-15 00:00:04 +00:00
Dan Willemsen 01f4e20172 Merge "Overridden packages shouldn't install vdex files either" 2017-04-14 23:53:23 +00:00
Colin Cross d2e778fb5a Set PRIVATE_PREFIX when using $(transform-prebuilt-to-target)
If PRIVATE_PREFIX is unset transform-prebuilt-to-target references
$(DISPLAY) instead of $(HOST_DISPLAY) or $(TARGET_DISPLAY), which
causes unnecessary kati regenerations when the DISPLAY environment
variable changes.

Bug: 36901093
Bug: 37333696
Test: grep for $DISPLAY in out/build-${TARGET_PRODUCT}.ninja
Change-Id: Ia9802fc2b07da9b74e8f80dfdcef121408cd9817
2017-04-14 15:24:49 -07:00
Dan Willemsen e224725c95 Overridden packages shouldn't install vdex files either
Bug: 37348494
Test: internal marlin, check for WebViewGoogle.vdex
Change-Id: I16469f7d84b972cee5b13aed58f4ec3f995cb83e
2017-04-14 13:33:58 -07:00
Colin Cross 5040efa694 Merge "Make mini-debug-info stripping pass on already stripped binaries" am: dd63df89d5
am: 4b69a9632e

Change-Id: Ie3bbf44ffc66069784ae8871cf09318d09c4d137
2017-04-14 20:20:45 +00:00
Colin Cross 4b69a9632e Merge "Make mini-debug-info stripping pass on already stripped binaries"
am: dd63df89d5

Change-Id: Ideef857ffdd4a56cfdd954151d4963f5c359e473
2017-04-14 20:18:45 +00:00
Colin Cross dd63df89d5 Merge "Make mini-debug-info stripping pass on already stripped binaries" 2017-04-14 20:14:42 +00:00
Adam Seaton 696a580f67 Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284 am: 72c26c936b am: fcac1e2dda am: 51c0c361a6 am: 6be965be74
am: 12d7052ea6

Change-Id: I1c9f8a2d0079de46580df57e3e960f39f835a5c4
2017-04-13 23:14:20 +00:00
Adam Seaton 4f297dfae5 [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01 am: 53980e19aa -s ours am: 773e5235e6 am: 594667da85 am: 2ae448cdb0 am: 0a38661a39
am: 521d7efcc3

Change-Id: I326193c7e7a580a84b8bf7688a041961f510423e
2017-04-13 23:14:12 +00:00
Adam Seaton c3b667d4a6 Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809 -s ours am: a0e65c2249 am: 5f77d46693 am: c88e5bdef3 am: 07d9fa6787
am: 8f91143bde

Change-Id: I5b76d00525687159597bd607dc838d3db66d287a
2017-04-13 23:13:59 +00:00
Adam Seaton 12d7052ea6 Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284 am: 72c26c936b am: fcac1e2dda am: 51c0c361a6
am: 6be965be74

Change-Id: I326d377498ff0aee061f2e7d79ffc53d8f207a43
2017-04-13 23:08:20 +00:00
Adam Seaton 521d7efcc3 [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01 am: 53980e19aa -s ours am: 773e5235e6 am: 594667da85 am: 2ae448cdb0
am: 0a38661a39

Change-Id: I430683f3f69df6f57cbc7779137dadb5a1d1244b
2017-04-13 23:08:12 +00:00
Adam Seaton 8f91143bde Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809 -s ours am: a0e65c2249 am: 5f77d46693 am: c88e5bdef3
am: 07d9fa6787

Change-Id: I24dc2bc058fa34b0da8a75acb192156f71316d84
2017-04-13 23:07:58 +00:00
Adam Seaton 6be965be74 Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284 am: 72c26c936b am: fcac1e2dda
am: 51c0c361a6

Change-Id: I389c07f81d5ddfd34b139f5e83b988ae0c80fc16
2017-04-13 23:02:19 +00:00
Adam Seaton 0a38661a39 [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01 am: 53980e19aa -s ours am: 773e5235e6 am: 594667da85
am: 2ae448cdb0

Change-Id: Iccfbe3f60592ca0250bcf5c2884200f772ab0600
2017-04-13 23:02:12 +00:00
Adam Seaton 07d9fa6787 Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809 -s ours am: a0e65c2249 am: 5f77d46693
am: c88e5bdef3

Change-Id: I97e08b421917ac884f2b0f41c01bc046585ae91c
2017-04-13 23:01:58 +00:00
Adam Seaton 51c0c361a6 Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284 am: 72c26c936b
am: fcac1e2dda

Change-Id: I0e26baedbcd9e0f76488d070b688f8d167fe3a90
2017-04-13 22:55:52 +00:00
Adam Seaton 2ae448cdb0 [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01 am: 53980e19aa -s ours am: 773e5235e6
am: 594667da85

Change-Id: Ic467c0312aaa91ceb07f0b30a2fca5d77768f41b
2017-04-13 22:55:42 +00:00
Adam Seaton c88e5bdef3 Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809 -s ours am: a0e65c2249
am: 5f77d46693

Change-Id: Ia9f81fc180122669361778a8acea5cb5f54d8df3
2017-04-13 22:55:28 +00:00
Adam Seaton fcac1e2dda Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284
am: 72c26c936b

Change-Id: Icef58fd5f7788229efae42592c5f05ba086ce0a1
2017-04-13 22:49:18 +00:00
Adam Seaton 594667da85 [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01 am: 53980e19aa -s ours
am: 773e5235e6

Change-Id: I477e052711d151121b2bdab8f6e9ce0fe15cc1b0
2017-04-13 22:49:11 +00:00
Adam Seaton 5f77d46693 Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809 -s ours
am: a0e65c2249

Change-Id: Ic866d9bfaf505d44a61aae99e728f7c5cd812791
2017-04-13 22:48:57 +00:00
Adam Seaton 72c26c936b Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61
am: a34ba7f284

Change-Id: Ib1f877ea42a1603f7b53796997fb36600873bfee
2017-04-13 22:43:14 +00:00