Commit Graph

11922 Commits

Author SHA1 Message Date
Chih-hung Hsieh
355e96774b Merge "Add -Werror to compile warning free projects." 2016-10-13 00:42:01 +00:00
Andreas Gampe
d9a8c65ac0 Merge "Build: add preloaded-classes and compiled-classes dependency" am: a0d201bd9a am: bc166c799d am: b47c19599c
am: 7581601b31

Change-Id: Ia21f659163f41f45678dab30187d9ab356ea61cb
2016-10-12 19:01:23 +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
Chih-Hung Hsieh
2ce51fc365 Remove valgrind from the exception list.
Now valgrind is built with clang/llvm for
the host and all supported targets.

Bug: 28454823
Test: build
Change-Id: Icb4bb7626a79aa309cec2b396cbd8f155895c901
2016-10-11 15:36:04 -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
TreeHugger Robot
d6c7ce2fb3 Merge "Make AVB work when BOARD_USES_RECOVERY_AS_BOOT is set to true." 2016-10-07 18:45:49 +00:00
Dan Willemsen
08c7cf1765 Merge "Use ASAN prebuilts if SANITIZE_HOST includes address" am: daba887656 am: 3a14d45f83 am: b4cfe8c7f9
am: 9f9d5f001f

Change-Id: I7cdc8abcaccccf89631673b5b5f56bd092c4ab94
2016-10-07 01:38:39 +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
c9b3032fe7 Merge "Replace product variable stashing with .KATI_READONLY" am: 157ad04cfc am: 9d2208441c am: 34d8c31258
am: 829ab04c9b

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

Change-Id: Id0aacce12567d2de793e96f89e933b86771c9d50
2016-10-06 23:57:01 +00: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
Guang Zhu
c67a71a238 remove use of CTS_TESTCASES_OUT
Bug: 31788743
Test: $ make cts dist
      # check contents of generated package and API coverage
      # report
      $ make checkbuild

Change-Id: Ieec069bafbcc6df5a5b3b06befb4a3a5678a06fd
2016-10-06 12:47:33 -07: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
David Zeuthen
b76f8a4e08 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: aosp_x86_64-eng 'm' and 'm dist' successful.
Change-Id: If033e5c93f5b71fd17405af7d970dc3f0540a1d2
2016-10-06 15:02:48 -04:00
Dan Willemsen
1563b032bb Remove obsolete BOARD_BVB_ENABLE reference
am: 90d946e577

Change-Id: I31ce0c0783e7908c2bdfe0341925f2c7dea5ea6c
2016-10-06 17:51:36 +00: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
Akshay Thakker
0de91e9bf3 Set N-MR1 to version 7.1.1.
am: d634094543

Change-Id: I2976fd1363597b632482de6c2f9cbdc4166c7a03
2016-10-05 23:23:37 +00:00
TreeHugger Robot
d22aeb6899 Merge "Set N-MR1 to version 7.1.1." into nyc-mr1-dev 2016-10-05 23:17:38 +00:00
Dan Willemsen
e3dc3bfc0d Merge "Add tool to run kati for all products" am: 480678e220 am: 652c4b4001 am: 8c0a4f49a2
am: c9c6284660

Change-Id: I0b221dedce563a7ad24260af88e3bdffb64cbef0
2016-10-05 23:07:47 +00:00
Dan Willemsen
c9c6284660 Merge "Add tool to run kati for all products" am: 480678e220 am: 652c4b4001
am: 8c0a4f49a2

Change-Id: I086f181ffcd8291fa950c084f0471686d845eaf7
2016-10-05 23:04:28 +00:00
Dan Willemsen
8c0a4f49a2 Merge "Add tool to run kati for all products" am: 480678e220
am: 652c4b4001

Change-Id: I70645fc341fa1df26635d60731c8877421f73ead
2016-10-05 23:01:28 +00:00
Dan Willemsen
4c364620ac Add tool to run kati for all products
Test: get_build_var all_named_products
Test: build/tools/kati_all_products.sh
Change-Id: I3496cb4c59a1edb11c9149b95ecabd3a828b8972
2016-10-05 14:04:21 -07:00
Jakub Adamek
7b17a8670a Install runtime resource overlay without subdir. am: a08a1015bc
am: 44dd3e2842

Change-Id: I4771a346cb7be04f574d66fb86bf0070383fa2c5
2016-10-05 20:09:17 +00:00
Jakub Adamek
44dd3e2842 Install runtime resource overlay without subdir.
am: a08a1015bc

Change-Id: I1ca2e029b79bf125145d2031a722914fe24dd299
2016-10-05 20:03:45 +00:00
Jakub Adámek
84973f87e6 Merge "Install runtime resource overlay without subdir." into cw-f-dev 2016-10-05 19:57:22 +00:00
Dan Willemsen
73cead3e89 Package up proguard jack_dictionary
am: ea99c1da30

Change-Id: If2abc83918a7e1e229ff5233f7d49416d082a663
2016-10-05 17:22:34 +00:00
Dan Willemsen
3304ab936b Merge "Remove redundant LIBART_IMG_{HOST,TARGET}_BASE_ADDRESS" am: 2849d4f9d9 am: bd1232517d am: d0d4c9ad9a
am: 823097d57b

Change-Id: I66ebc2061f59a40e03d534ed0cb0fba6bc98109e
2016-10-05 17:10:04 +00:00
Dan Willemsen
823097d57b Merge "Remove redundant LIBART_IMG_{HOST,TARGET}_BASE_ADDRESS" am: 2849d4f9d9 am: bd1232517d
am: d0d4c9ad9a

Change-Id: Id050ecbcb5192fb0a5370f18c87d329fffdcd176
2016-10-05 17:07:06 +00:00
Dan Willemsen
d0d4c9ad9a Merge "Remove redundant LIBART_IMG_{HOST,TARGET}_BASE_ADDRESS" am: 2849d4f9d9
am: bd1232517d

Change-Id: I58327058566f1a081dbfc2a3eac86bc8a726c7e5
2016-10-05 17:04:04 +00:00
Jakub Adamek
a08a1015bc Install runtime resource overlay without subdir.
Runtime resource overlay is a bare APK with just the overlaid
resources. There is no need for additional subdir.
See http://go/sku-colors.

Bug: 31692079
Change-Id: Iff3d58f941e764a7be3ec04cafeefd592bd8b944
2016-10-05 10:03:28 +01:00