Commit Graph

32032 Commits

Author SHA1 Message Date
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 bc166c799d Merge "Build: add preloaded-classes and compiled-classes dependency"
am: a0d201bd9a

Change-Id: I28bee3466ab8710ada8d5e6068cdda9fdb1dc3d1
2016-10-12 18:41:22 +00:00
Treehugger Robot a0d201bd9a Merge "Build: add preloaded-classes and compiled-classes dependency" 2016-10-12 18:30:11 +00:00
Chih-Hung Hsieh 71155edd09 Merge "Better pattern matching and dump of warning messages." am: 6949e7ecba am: 1a876e215b
am: fbb1b890fa

Change-Id: Icaff358e282166c635c3ac2edd3297547c32cf6d
2016-10-12 16:59:33 +00:00
Chih-Hung Hsieh ae1a5c973b Merge "Normalize warning source file path to relative path." am: eb2f711528 am: d4b0a20c01
am: b4a26ee48f

Change-Id: I9fa7bdf12f86f65259409a1dc0735ab455ea6320
2016-10-12 16:59:19 +00:00
Chih-Hung Hsieh fbb1b890fa Merge "Better pattern matching and dump of warning messages." am: 6949e7ecba
am: 1a876e215b

Change-Id: Ieeb9fe468a12aeb532f35ede9879f3968441709d
2016-10-12 16:52:01 +00:00
Chih-Hung Hsieh b4a26ee48f Merge "Normalize warning source file path to relative path." am: eb2f711528
am: d4b0a20c01

Change-Id: I16d7425b3a933596c06ee7acdf396b0b2b37a483
2016-10-12 16:51:46 +00:00
Chih-Hung Hsieh 1a876e215b Merge "Better pattern matching and dump of warning messages."
am: 6949e7ecba

Change-Id: Ib643d3e03eb22ec4929054d4ab8542dd62b8963b
2016-10-12 16:44:57 +00:00
Chih-Hung Hsieh d4b0a20c01 Merge "Normalize warning source file path to relative path."
am: eb2f711528

Change-Id: I8d86fc1c82c65387b50bba8374fce8ecbb98a80b
2016-10-12 16:44:44 +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
Treehugger Robot 6949e7ecba Merge "Better pattern matching and dump of warning messages." 2016-10-12 16:35:34 +00:00
Treehugger Robot eb2f711528 Merge "Normalize warning source file path to relative path." 2016-10-12 16:34:05 +00:00
Jeff Sharkey 3f391240d5 Merge "PRODUCT_PACKAGES: add to tune2fs." am: 4337794acd am: a35fba1954
am: 7f5ac24eec

Change-Id: Ia038eb10af41c7403a04e9e5411700cd86079640
2016-10-12 01:35:52 +00:00
Jeff Sharkey 7f5ac24eec Merge "PRODUCT_PACKAGES: add to tune2fs." am: 4337794acd
am: a35fba1954

Change-Id: Id89be8d1c14a7d93c1946d7c3ec096fc9b20e231
2016-10-12 01:29:22 +00:00
Jeff Sharkey a35fba1954 Merge "PRODUCT_PACKAGES: add to tune2fs."
am: 4337794acd

Change-Id: I156f1cb5ccd377785f77399e005bcfab10b5c3b3
2016-10-12 01:23:22 +00:00
Jeff Sharkey 4337794acd Merge "PRODUCT_PACKAGES: add to tune2fs." 2016-10-12 01:16:33 +00:00
Chih-Hung Hsieh 5722f9247b Better pattern matching and dump of warning messages.
* Warning messages must start with source file path.
  This will reject lines containing only 'warning:'
  but not a source file path prefix.
* Escape both backslash and quotation marks in the
  dump of strings to JavaScript string literals.

Bug: 32060052
Test: run through build.log files
Change-Id: Ib064768b1ba2954f974604ea054f7a6d2ad15ae7
2016-10-11 15:33:19 -07:00
Chih-Hung Hsieh a45c5c1cf9 Normalize warning source file path to relative path.
Remove Android root directory path from long
absolute source file path.

Test: run warn.py with build.log
Bug: 32059187
Change-Id: Ib630cebd8c56a9fef443139ca502d97e59c7b42e
2016-10-11 15:30:26 -07:00
Yunlian Jiang b087e00ba0 Merge "Fix a nullness warning." am: b37e81d3cd am: 10b5a9d3f6
am: ea4f981031

Change-Id: Ie1fd127b89e6bc37514b05051708e69f37ae95f9
2016-10-11 19:48:01 +00:00
Yunlian Jiang ea4f981031 Merge "Fix a nullness warning." am: b37e81d3cd
am: 10b5a9d3f6

Change-Id: I07c3a7c4f8b08b3b9c0a90a6b72cae70efcf9f4e
2016-10-11 19:42:01 +00:00
Yunlian Jiang 10b5a9d3f6 Merge "Fix a nullness warning."
am: b37e81d3cd

Change-Id: I0393f42a1d2a0e73e0c29a0e0047479f49982788
2016-10-11 19:35:31 +00:00
Treehugger Robot b37e81d3cd Merge "Fix a nullness warning." 2016-10-11 19:29:37 +00:00
Yunlian Jiang 4fdd8f156d Merge "Fix an uninitialized value warning." am: f943e138d7 am: d7a0b25d66
am: 570063f82d

Change-Id: Iefbe15d4bb48b9e92df1a2223cccec0a32000452
2016-10-11 03:05:28 +00:00
Yunlian Jiang 570063f82d Merge "Fix an uninitialized value warning." am: f943e138d7
am: d7a0b25d66

Change-Id: I0f19e57829765e7d070cad4370d808a3a23d46ad
2016-10-11 02:59:59 +00:00
Yunlian Jiang d7a0b25d66 Merge "Fix an uninitialized value warning."
am: f943e138d7

Change-Id: I9c3a911998740998608690ce885d2826a710b3d4
2016-10-11 02:53:58 +00:00
Treehugger Robot f943e138d7 Merge "Fix an uninitialized value warning." 2016-10-11 02:43:47 +00:00
Yunlian Jiang 221c1c027a Fix an uninitialized value warning.
Warning from the static analyzer:

build/tools/zipalign/ZipFile.cpp:503:5: warning: Function call argument
is an uninitialized value
pEntry->setDataInfo(uncompressedLen, endPosn - startPosn, crc,

Specifically, it's referencing `crc`, which would be uninitialized if we
hit either of these two error cases, since we'd return `NO_ERROR`.

Note that the warning is still there, but that's only because the static
analyzer can't see the asserts. If we #undef NDEBUG in the file, then
the warning disappears.

Bug: none
Test: With NDEBUG undefined, the warning is gone.
Change-Id: Iaed66127746c38add2c842ab027f2e1982d0e2fd
2016-10-10 17:31:06 -07:00
Dirk Dougherty 6905131b1c Fix samples metadata concat. am: 8d565ed204 am: bafc0b1baf am: 20e91f4e7a
am: 3dc35a0148

Change-Id: I1dcbc4eadda8cf03bbad1c4278efdd6dad0c6eaf
2016-10-08 02:40:32 +00:00
Dirk Dougherty 3dc35a0148 Fix samples metadata concat. am: 8d565ed204 am: bafc0b1baf
am: 20e91f4e7a

Change-Id: I7e77f030b6dc45da3b22459bbd5871ff42285ba8
2016-10-08 02:35:33 +00:00
Dirk Dougherty 7f56225968 Fix samples metadata concat. am: 8d565ed204
am: 22fe7409a4

Change-Id: I08418dfb23d225fa73ed21cb0704b69c2c8d0028
2016-10-08 02:31:32 +00:00
Dirk Dougherty 20e91f4e7a Fix samples metadata concat. am: 8d565ed204
am: bafc0b1baf

Change-Id: I21dadb32eeb771aae9c188372d0da1cf4ea16126
2016-10-08 02:31:32 +00:00
Dirk Dougherty 22fe7409a4 Fix samples metadata concat.
am: 8d565ed204

Change-Id: Ic1a7d62fb278022518154f9c8fe3394df620670c
2016-10-08 02:27:02 +00:00
Dirk Dougherty bafc0b1baf Fix samples metadata concat.
am: 8d565ed204

Change-Id: I02cf4c7c04ac691b71ef48a6e584c8f2b224a6ff
2016-10-08 02:27:01 +00: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
David Zeuthen ec6fe8065e Merge "Make AVB work when BOARD_USES_RECOVERY_AS_BOOT is set to true."
am: 01bd1d34db

Change-Id: I38f97817667bb0ddcfa4d4142ded36d8e75940f6
2016-10-07 19:50:31 +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
Dirk Dougherty 8d565ed204 Fix samples metadata concat.
Change-Id: Ie9b616818995b3066d0e65ea1aa30077ed9d82ce
2016-10-07 12:12:50 -07: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
Guang Zhu b5e2ecab4d Merge "remove use of CTS_TESTCASES_OUT"
am: 24dd78a2d7

Change-Id: If15ad7d5f255f77bdf619d75bee393d6c661cc90
2016-10-07 01:18:11 +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
Dan Willemsen 3a14d45f83 Merge "Use ASAN prebuilts if SANITIZE_HOST includes address"
am: daba887656

Change-Id: If861bf6ab96f4cab777be5d39d75b151791be42c
2016-10-07 01:14:07 +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