Commit Graph

11251 Commits

Author SHA1 Message Date
Adam Seaton 876a086d62 Updating Security String to 2016-12-05 am: 38dcf47813 am: 71e1b726e2 am: e6b85b662f
am: b7d1dca71b

Change-Id: I70dc00216821e1a3e3dbb4ccde577628acbdbd88
2016-10-19 17:57:41 +00:00
Adam Seaton 88baf588f9 Updating Security String to 2016-12-01 am: 1f7c92c5db am: c9c0ba7572 am: caee659bc7
am: 8e10972458

Change-Id: I734205a537261e68bc2635c2cdc333be67eae0c8
2016-10-19 17:57:35 +00:00
Adam Seaton b7d1dca71b Updating Security String to 2016-12-05 am: 38dcf47813 am: 71e1b726e2
am: e6b85b662f

Change-Id: Ib1eebc264c6babbfdd4e31b74fcb2b0042288da0
2016-10-19 17:50:37 +00:00
Adam Seaton 8e10972458 Updating Security String to 2016-12-01 am: 1f7c92c5db am: c9c0ba7572
am: caee659bc7

Change-Id: I4f50d940566865be021ceda6730c47d2cb29cecd
2016-10-19 17:50:32 +00:00
Adam Seaton e6b85b662f Updating Security String to 2016-12-05 am: 38dcf47813
am: 71e1b726e2

Change-Id: I0ae4f763e19f9db41a748aa3ce79775e2bd2946c
2016-10-19 17:44:06 +00:00
Adam Seaton caee659bc7 Updating Security String to 2016-12-01 am: 1f7c92c5db
am: c9c0ba7572

Change-Id: I4bdf3f3f69f7c2220bd328586e61a75fd765ea5c
2016-10-19 17:44:01 +00:00
Adam Seaton 71e1b726e2 Updating Security String to 2016-12-05
am: 38dcf47813

Change-Id: I3fd8785e5b66fc27cf589f9172445081c5051be8
2016-10-19 17:36:12 +00:00
Adam Seaton c9c0ba7572 Updating Security String to 2016-12-01
am: 1f7c92c5db

Change-Id: I48dbe98c5b7ec8270acde0c4bca570cf9acb1ffa
2016-10-19 17:36:05 +00:00
Adam Seaton 38dcf47813 Updating Security String to 2016-12-05
nyc-dev
b/32249855
2016-10-18 16:30:21 -07:00
Adam Seaton 1f7c92c5db Updating Security String to 2016-12-01
nyc-dev
b/32249855
2016-10-18 16:29:23 -07:00
Ryan Campbell 74ef8e0a88 Merge "Fix bug preventing multi-module native coverage."
am: 3372ce615a

Change-Id: I2ae9aa039b6fe5d375b514a9a5fb9cb2697bca55
2016-10-18 00:49:03 +00:00
Treehugger Robot 3372ce615a Merge "Fix bug preventing multi-module native coverage." 2016-10-18 00:43:10 +00:00
Dan Albert 55c6b82091 Merge "Add a dist goal for the NDK."
am: e5d1926c61

Change-Id: I469216eb13da6061854a48f28d3fb3fcea4a0068
2016-10-17 23:09:26 +00:00
Treehugger Robot e5d1926c61 Merge "Add a dist goal for the NDK." 2016-10-17 22:59:17 +00:00
Ryan Campbell 4a3be3db47 Fix bug preventing multi-module native coverage.
Fix a whitespace bug causing coverage to be enabled on all modules
whenever more than one module is specified. This is caused by
comparing whitespace to the empty string, which are not equal. Fix
by stripping the output to check for path matches.

Test: tested using local build with coverage enabled on NFC, lights
Change-Id: I61a775cfd135f94ea1e1ee9fdbed3c64c5bb1a2e
2016-10-17 15:43:21 -07:00
Sasha Levitskiy 1ea9eacdae Merge "build: tools: Add json collection of installed files with hashes."
am: fe77369b50

Change-Id: Ib3e9c8dead0a6fdbb0f93690da66e2a8e1ea0f39
2016-10-15 01:13:22 +00:00
Dan Albert 4d323338fe Add a dist goal for the NDK.
Test: make sdk dist
Bug: None
Change-Id: I07dfc73e3cea5afebcf5ed10cf860eb3f33cbff6
2016-10-14 16:45:30 -07:00
Sasha Levitskiy 4a34533e11 build: tools: Add json collection of installed files with hashes.
Adds installed-files.json in addition to installed-files.txt
Further sorts the file list to be ordered within the same size bucket.

Test: manual, cross-checked checksums with sha256sum utility
      checked build outputs.

Bug: 19988819
Merged-in: Ifb632eb4df65ec48645c8f93e36bae44ccc52ba8
Change-Id: Ifb632eb4df65ec48645c8f93e36bae44ccc52ba8
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2016-10-14 16:29:16 -07:00
David Srbecky a17e3542b2 Merge "Generate SHA-1 build ID for host-generated *.oat files (2/2)." am: 5ccc874ba1 am: 53502853b0
am: eeabe6cfbf

Change-Id: Ie9034b118f21c42ad631f6d06d7e29afa8ac8bff
2016-10-13 13:16:41 +00:00
David Srbecky eeabe6cfbf Merge "Generate SHA-1 build ID for host-generated *.oat files (2/2)." am: 5ccc874ba1
am: 53502853b0

Change-Id: Ifacc968933106ee99db51f25ca197772859a7a41
2016-10-13 13:09:40 +00:00
David Srbecky 5ccc874ba1 Merge "Generate SHA-1 build ID for host-generated *.oat files (2/2)." 2016-10-13 12:52:31 +00:00
Chih-hung Hsieh a70f8fc5d5 Merge "Add -Werror to compile warning free projects." am: 355e96774b am: 05388b7618
am: 9f82feb9e6

Change-Id: I2738360c847b6181756b46801d90d26de04933b0
2016-10-13 01:06:18 +00:00
Chih-hung Hsieh 9f82feb9e6 Merge "Add -Werror to compile warning free projects." am: 355e96774b
am: 05388b7618

Change-Id: Ib4613feea14a0edf06f5395b1646a0c148a7a792
2016-10-13 00:59:46 +00:00
Chih-hung Hsieh 355e96774b Merge "Add -Werror to compile warning free projects." 2016-10-13 00:42:01 +00:00
Andreas Gampe 7581601b31 Merge "Build: add preloaded-classes and compiled-classes dependency" am: a0d201bd9a am: bc166c799d
am: b47c19599c

Change-Id: Ia82f7ccac2a8df505e2199baf62de5e1556a35ca
2016-10-12 18:54:22 +00:00
Andreas Gampe b47c19599c Merge "Build: add preloaded-classes and compiled-classes dependency" am: a0d201bd9a
am: bc166c799d

Change-Id: I38dc9783c694c82593e7056707a09e520a789aeb
2016-10-12 18:47:52 +00:00
Andreas Gampe da6ddc4086 Build: add preloaded-classes and compiled-classes dependency
Make the ART boot image compilation rule depend on the files
influencing the layout and contents of the image. Required for
incremental builds.

Bug: 32107291
Test: m
Test: echo "android.util.MutableChar" >> frameworks/base/compiled-classes-phone && m
Test: rm frameworks/base/compiled-classes-phone && m
Change-Id: I7b7438672460d8d9d2c8b08b8e7c3cbde8d07a1a
2016-10-12 09:35:39 -07:00
Chih-Hung Hsieh bab0488828 Add -Werror to compile warning free projects.
* Add -Werror if LOCAL_PATH is in the WARNING_DISALLOWED project list,
  or not in the WARNING_ALLOWED project list.

Test: Build for major targets.
Change-Id: I12235ee1ca1c1837530693699e705e1955275565
2016-10-11 15:38:39 -07:00
David Zeuthen 757d17753b resolve merge conflicts of aa126ab to nyc-mr1-dev-plus-aosp
Change-Id: I6e45dff4fcc873a91b6067a04f9fa4e801a1f4c2
2016-10-07 16:27:34 -04:00
David Zeuthen aa126abe22 Merge "Make AVB work when BOARD_USES_RECOVERY_AS_BOOT is set to true." am: 01bd1d34db
am: ec6fe8065e

Change-Id: I48f5fd6fd8c1334679117d735a1a28a76e0edf3c
2016-10-07 19:54:30 +00:00
Treehugger Robot 01bd1d34db Merge "Make AVB work when BOARD_USES_RECOVERY_AS_BOOT is set to true." 2016-10-07 19:44:37 +00:00
Guang Zhu bd8ab0da8b Merge "remove use of CTS_TESTCASES_OUT" am: 24dd78a2d7 am: b5e2ecab4d
am: 30858857a0

Change-Id: Ib5f060e87d8319968795e00bf6259d2ec1690629
2016-10-07 01:24:48 +00:00
Guang Zhu 30858857a0 Merge "remove use of CTS_TESTCASES_OUT" am: 24dd78a2d7
am: b5e2ecab4d

Change-Id: If73c4c104565d588266afde173bd7191a4580b11
2016-10-07 01:21:17 +00:00
Dan Willemsen 9f9d5f001f Merge "Use ASAN prebuilts if SANITIZE_HOST includes address" am: daba887656 am: 3a14d45f83
am: b4cfe8c7f9

Change-Id: Ie4ef75194162b8b0aa3efc4dd3b8f6a883115116
2016-10-07 01:21:07 +00:00
Dan Willemsen b4cfe8c7f9 Merge "Use ASAN prebuilts if SANITIZE_HOST includes address" am: daba887656
am: 3a14d45f83

Change-Id: I2ca851e21aac95df1a214c358b20efb7845d3a35
2016-10-07 01:17:37 +00:00
Guang Zhu 24dd78a2d7 Merge "remove use of CTS_TESTCASES_OUT" 2016-10-07 01:15:17 +00:00
Treehugger Robot daba887656 Merge "Use ASAN prebuilts if SANITIZE_HOST includes address" 2016-10-07 01:08:07 +00:00
Guang Zhu 29fe14721e remove use of CTS_TESTCASES_OUT
Bug: 31788743
Test: $ make cts dist
      # check contents of generated package and API coverage
      # report
      $ make checkbuild

Merged-In: Ieec069bafbcc6df5a5b3b06befb4a3a5678a06fd
Change-Id: Ieec069bafbcc6df5a5b3b06befb4a3a5678a06fd
(cherry picked from commit f8f0880b3b8fb6a80ed766068d5f1714625b8960)
2016-10-06 16:57:39 -07:00
Dan Willemsen 829ab04c9b Merge "Replace product variable stashing with .KATI_READONLY" am: 157ad04cfc am: 9d2208441c
am: 34d8c31258

Change-Id: Idc49bb5ad4890c368762cd73ac34e995b2633d1d
2016-10-06 23:53:30 +00:00
Dan Willemsen 34d8c31258 Merge "Replace product variable stashing with .KATI_READONLY" am: 157ad04cfc
am: 9d2208441c

Change-Id: Id3734b7f7c983405c2ae00595d9d9a951adb9468
2016-10-06 23:50:01 +00:00
Ryan Campbell acc948b0b0 Merge "Support multiple arch for coverage packaging." am: 56b5030eac am: 2882b0aff1
am: 248a9768c7

Change-Id: I12526870d123ccb34d65d63899268d843734b87d
2016-10-06 23:42:59 +00:00
Treehugger Robot 157ad04cfc Merge "Replace product variable stashing with .KATI_READONLY" 2016-10-06 23:41:30 +00:00
Ryan Campbell 248a9768c7 Merge "Support multiple arch for coverage packaging." am: 56b5030eac
am: 2882b0aff1

Change-Id: I0bad79535b4603fc34937971163b24bac96f841d
2016-10-06 23:39:29 +00:00
Ryan Campbell 56b5030eac Merge "Support multiple arch for coverage packaging." 2016-10-06 23:25:09 +00:00
David Zeuthen b2fea5878c Make AVB work when BOARD_USES_RECOVERY_AS_BOOT is set to true.
Often BOARD_USES_RECOVERY_AS_BOOT is used together with
BOARD_BUILD_SYSTEM_ROOT_IMAGE, but with this combination we're currently
not adding a hash footer to boot.img. Fix this.

Bug: 31119415
Test: Built with BOARD_USES_RECOVERY_AS_BOOT set to true and inspected images.
Merged-In: If033e5c93f5b71fd17405af7d970dc3f0540a1d2
Change-Id: I2f10bbffb0ba2467d53e3e62d5379c3ab7236063
2016-10-06 15:15:00 -04:00
Dan Willemsen c1f17ffc7d Replace product variable stashing with .KATI_READONLY
Instead of using rot13 / rot26, use the Kati extension to mark these
variables as readonly.

Move $(strip) for a few variables to before they're marked readonly. Use
a different variable for modifications to BOARD_KERNEL_CMDLINE in
build/core/Makefile.

Test: build/tools/kati_all_products.mk on AOSP and internal master
Test: build-aosp_bullhead.ninja the same before / after
Change-Id: If98b24af763831a9c5c2de38037a69ab1bf9e023
2016-10-06 10:50:26 -07:00
Dan Willemsen 90d946e577 Remove obsolete BOARD_BVB_ENABLE reference
Test: None
Change-Id: Ic6af0ecb0bb6989501189344f9e57d21c4ced0bb
2016-10-06 10:26:19 -07:00
Dan Willemsen 3b4d17ffe7 Use ASAN prebuilts if SANITIZE_HOST includes address
Test: SANITIZE_HOST=address m -j showcommands
Change-Id: Ifdca98d5fa32867005ace99e1eb5188e22923ac6
2016-10-05 23:26:24 -07:00
Alexey Alexandrov e469063a93 Generate SHA-1 build ID for host-generated *.oat files (2/2).
For host-generated *.oat files, generate a SHA-1 build ID based on the
file content and write it to .note.gnu.build-id ELF section.  This
should allow various developer tools like profilers correlate the data
captured for files like boot.oat on the device with the corresponding
known version of the file during an offline analysis.

Test: Verified that boot.oat contains the build ID section now.
Test: make test-art-host
Bug: 31292208
Change-Id: Iee48e437009488f20995e73868d5059d349701c0
2016-10-05 19:20:36 -07:00
Akshay Thakker 358afc9a73 Set N-MR1 to version 7.1.1. am: d634094543
am: 0de91e9bf3

Change-Id: Ibc4c5102bf8294b0f446d80abc6e1eabe0267ac2
2016-10-05 23:26:38 +00:00