OSDN Git Service

android-x86/build.git
7 years agoMerge "Better pattern matching and dump of warning messages." am: 6949e7ecba
Chih-Hung Hsieh [Wed, 12 Oct 2016 16:52:01 +0000 (16:52 +0000)]
Merge "Better pattern matching and dump of warning messages." am: 6949e7ecba
am: 1a876e215b

Change-Id: Ieeb9fe468a12aeb532f35ede9879f3968441709d

7 years agoMerge "Normalize warning source file path to relative path." am: eb2f711528
Chih-Hung Hsieh [Wed, 12 Oct 2016 16:51:46 +0000 (16:51 +0000)]
Merge "Normalize warning source file path to relative path." am: eb2f711528
am: d4b0a20c01

Change-Id: I16d7425b3a933596c06ee7acdf396b0b2b37a483

7 years agoMerge "Better pattern matching and dump of warning messages."
Chih-Hung Hsieh [Wed, 12 Oct 2016 16:44:57 +0000 (16:44 +0000)]
Merge "Better pattern matching and dump of warning messages."
am: 6949e7ecba

Change-Id: Ib643d3e03eb22ec4929054d4ab8542dd62b8963b

7 years agoMerge "Normalize warning source file path to relative path."
Chih-Hung Hsieh [Wed, 12 Oct 2016 16:44:44 +0000 (16:44 +0000)]
Merge "Normalize warning source file path to relative path."
am: eb2f711528

Change-Id: I8d86fc1c82c65387b50bba8374fce8ecbb98a80b

7 years agoMerge "Better pattern matching and dump of warning messages."
Treehugger Robot [Wed, 12 Oct 2016 16:35:34 +0000 (16:35 +0000)]
Merge "Better pattern matching and dump of warning messages."

7 years agoMerge "Normalize warning source file path to relative path."
Treehugger Robot [Wed, 12 Oct 2016 16:34:05 +0000 (16:34 +0000)]
Merge "Normalize warning source file path to relative path."

7 years agoMerge "PRODUCT_PACKAGES: add to tune2fs." am: 4337794acd
Jeff Sharkey [Wed, 12 Oct 2016 01:29:22 +0000 (01:29 +0000)]
Merge "PRODUCT_PACKAGES: add to tune2fs." am: 4337794acd
am: a35fba1954

Change-Id: Id89be8d1c14a7d93c1946d7c3ec096fc9b20e231

7 years agoMerge "PRODUCT_PACKAGES: add to tune2fs."
Jeff Sharkey [Wed, 12 Oct 2016 01:23:22 +0000 (01:23 +0000)]
Merge "PRODUCT_PACKAGES: add to tune2fs."
am: 4337794acd

Change-Id: I156f1cb5ccd377785f77399e005bcfab10b5c3b3

7 years agoMerge "PRODUCT_PACKAGES: add to tune2fs."
Jeff Sharkey [Wed, 12 Oct 2016 01:16:33 +0000 (01:16 +0000)]
Merge "PRODUCT_PACKAGES: add to tune2fs."

7 years agoBetter pattern matching and dump of warning messages.
Chih-Hung Hsieh [Tue, 11 Oct 2016 22:33:19 +0000 (15:33 -0700)]
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

7 years agoNormalize warning source file path to relative path.
Chih-Hung Hsieh [Tue, 11 Oct 2016 22:30:26 +0000 (15:30 -0700)]
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

7 years agoMerge "Fix a nullness warning." am: b37e81d3cd
Yunlian Jiang [Tue, 11 Oct 2016 19:42:01 +0000 (19:42 +0000)]
Merge "Fix a nullness warning." am: b37e81d3cd
am: 10b5a9d3f6

Change-Id: I07c3a7c4f8b08b3b9c0a90a6b72cae70efcf9f4e

7 years agoMerge "Fix a nullness warning."
Yunlian Jiang [Tue, 11 Oct 2016 19:35:31 +0000 (19:35 +0000)]
Merge "Fix a nullness warning."
am: b37e81d3cd

Change-Id: I0393f42a1d2a0e73e0c29a0e0047479f49982788

7 years agoMerge "Fix a nullness warning."
Treehugger Robot [Tue, 11 Oct 2016 19:29:36 +0000 (19:29 +0000)]
Merge "Fix a nullness warning."

7 years agoMerge "Fix an uninitialized value warning." am: f943e138d7
Yunlian Jiang [Tue, 11 Oct 2016 02:59:59 +0000 (02:59 +0000)]
Merge "Fix an uninitialized value warning." am: f943e138d7
am: d7a0b25d66

Change-Id: I0f19e57829765e7d070cad4370d808a3a23d46ad

7 years agoMerge "Fix an uninitialized value warning."
Yunlian Jiang [Tue, 11 Oct 2016 02:53:58 +0000 (02:53 +0000)]
Merge "Fix an uninitialized value warning."
am: f943e138d7

Change-Id: I9c3a911998740998608690ce885d2826a710b3d4

7 years agoMerge "Fix an uninitialized value warning."
Treehugger Robot [Tue, 11 Oct 2016 02:43:46 +0000 (02:43 +0000)]
Merge "Fix an uninitialized value warning."

7 years agoFix an uninitialized value warning.
Yunlian Jiang [Wed, 5 Oct 2016 17:58:37 +0000 (10:58 -0700)]
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

7 years agoFix samples metadata concat.
Dirk Dougherty [Sat, 8 Oct 2016 02:27:02 +0000 (02:27 +0000)]
Fix samples metadata concat.
am: 8d565ed204

Change-Id: Ic1a7d62fb278022518154f9c8fe3394df620670c

7 years agoMerge "Make AVB work when BOARD_USES_RECOVERY_AS_BOOT is set to true." am: 01bd1d34db
David Zeuthen [Fri, 7 Oct 2016 19:54:30 +0000 (19:54 +0000)]
Merge "Make AVB work when BOARD_USES_RECOVERY_AS_BOOT is set to true." am: 01bd1d34db
am: ec6fe8065e

Change-Id: I48f5fd6fd8c1334679117d735a1a28a76e0edf3c

7 years agoMerge "Make AVB work when BOARD_USES_RECOVERY_AS_BOOT is set to true."
David Zeuthen [Fri, 7 Oct 2016 19:50:31 +0000 (19:50 +0000)]
Merge "Make AVB work when BOARD_USES_RECOVERY_AS_BOOT is set to true."
am: 01bd1d34db

Change-Id: I38f97817667bb0ddcfa4d4142ded36d8e75940f6

7 years agoMerge "Make AVB work when BOARD_USES_RECOVERY_AS_BOOT is set to true."
Treehugger Robot [Fri, 7 Oct 2016 19:44:37 +0000 (19:44 +0000)]
Merge "Make AVB work when BOARD_USES_RECOVERY_AS_BOOT is set to true."

7 years agoFix samples metadata concat.
Dirk Dougherty [Fri, 7 Oct 2016 19:12:50 +0000 (12:12 -0700)]
Fix samples metadata concat.

Change-Id: Ie9b616818995b3066d0e65ea1aa30077ed9d82ce

7 years agoMerge "remove use of CTS_TESTCASES_OUT" am: 24dd78a2d7
Guang Zhu [Fri, 7 Oct 2016 01:21:17 +0000 (01:21 +0000)]
Merge "remove use of CTS_TESTCASES_OUT" am: 24dd78a2d7
am: b5e2ecab4d

Change-Id: If73c4c104565d588266afde173bd7191a4580b11

7 years agoMerge "remove use of CTS_TESTCASES_OUT"
Guang Zhu [Fri, 7 Oct 2016 01:18:11 +0000 (01:18 +0000)]
Merge "remove use of CTS_TESTCASES_OUT"
am: 24dd78a2d7

Change-Id: If15ad7d5f255f77bdf619d75bee393d6c661cc90

7 years agoMerge "Use ASAN prebuilts if SANITIZE_HOST includes address" am: daba887656
Dan Willemsen [Fri, 7 Oct 2016 01:17:37 +0000 (01:17 +0000)]
Merge "Use ASAN prebuilts if SANITIZE_HOST includes address" am: daba887656
am: 3a14d45f83

Change-Id: I2ca851e21aac95df1a214c358b20efb7845d3a35

7 years agoMerge "remove use of CTS_TESTCASES_OUT"
Guang Zhu [Fri, 7 Oct 2016 01:15:16 +0000 (01:15 +0000)]
Merge "remove use of CTS_TESTCASES_OUT"

7 years agoMerge "Use ASAN prebuilts if SANITIZE_HOST includes address"
Dan Willemsen [Fri, 7 Oct 2016 01:14:07 +0000 (01:14 +0000)]
Merge "Use ASAN prebuilts if SANITIZE_HOST includes address"
am: daba887656

Change-Id: If861bf6ab96f4cab777be5d39d75b151791be42c

7 years agoMerge "Use ASAN prebuilts if SANITIZE_HOST includes address"
Treehugger Robot [Fri, 7 Oct 2016 01:08:06 +0000 (01:08 +0000)]
Merge "Use ASAN prebuilts if SANITIZE_HOST includes address"

7 years agoremove use of CTS_TESTCASES_OUT
Guang Zhu [Tue, 4 Oct 2016 23:43:40 +0000 (16:43 -0700)]
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)

7 years agoMerge "Replace product variable stashing with .KATI_READONLY" am: 157ad04cfc
Dan Willemsen [Thu, 6 Oct 2016 23:50:01 +0000 (23:50 +0000)]
Merge "Replace product variable stashing with .KATI_READONLY" am: 157ad04cfc
am: 9d2208441c

Change-Id: Id3734b7f7c983405c2ae00595d9d9a951adb9468

7 years agoMerge "Replace product variable stashing with .KATI_READONLY"
Dan Willemsen [Thu, 6 Oct 2016 23:46:30 +0000 (23:46 +0000)]
Merge "Replace product variable stashing with .KATI_READONLY"
am: 157ad04cfc

Change-Id: I0672cfab4bb7a87cecead3b168080aac208cf5eb

7 years agoMerge "Replace product variable stashing with .KATI_READONLY"
Treehugger Robot [Thu, 6 Oct 2016 23:41:29 +0000 (23:41 +0000)]
Merge "Replace product variable stashing with .KATI_READONLY"

7 years agoMerge "Support multiple arch for coverage packaging." am: 56b5030eac
Ryan Campbell [Thu, 6 Oct 2016 23:39:29 +0000 (23:39 +0000)]
Merge "Support multiple arch for coverage packaging." am: 56b5030eac
am: 2882b0aff1

Change-Id: I0bad79535b4603fc34937971163b24bac96f841d

7 years agoMerge "Support multiple arch for coverage packaging."
Ryan Campbell [Thu, 6 Oct 2016 23:36:00 +0000 (23:36 +0000)]
Merge "Support multiple arch for coverage packaging."
am: 56b5030eac

Change-Id: I5416d4c322db764662c97876c12e098a615af8a3

7 years agoMerge "Support multiple arch for coverage packaging."
Ryan Campbell [Thu, 6 Oct 2016 23:25:08 +0000 (23:25 +0000)]
Merge "Support multiple arch for coverage packaging."

7 years agoMake AVB work when BOARD_USES_RECOVERY_AS_BOOT is set to true.
David Zeuthen [Thu, 6 Oct 2016 17:05:38 +0000 (13:05 -0400)]
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

7 years agoReplace product variable stashing with .KATI_READONLY
Dan Willemsen [Wed, 5 Oct 2016 23:57:27 +0000 (16:57 -0700)]
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

7 years agoAdding excludeFromSuggestions, wear preview project path, and android wear/tv/auto...
Amanda Kassay [Thu, 6 Oct 2016 16:52:32 +0000 (16:52 +0000)]
Adding excludeFromSuggestions, wear preview project path, and android wear/tv/auto/versions projectsw to template
am: b5c04107af

Change-Id: I0dbabb4c9dfa21971d6c46f3eb68aedec377968b

7 years agoUse ASAN prebuilts if SANITIZE_HOST includes address
Dan Willemsen [Thu, 6 Oct 2016 06:26:24 +0000 (23:26 -0700)]
Use ASAN prebuilts if SANITIZE_HOST includes address

Test: SANITIZE_HOST=address m -j showcommands
Change-Id: Ifdca98d5fa32867005ace99e1eb5188e22923ac6

7 years agoMerge "Add a new ANALYZER severity group." am: 89244619ad
Chih-hung Hsieh [Wed, 5 Oct 2016 23:41:21 +0000 (23:41 +0000)]
Merge "Add a new ANALYZER severity group." am: 89244619ad
am: 8a2f279b37

Change-Id: If326565dda294235df273211ba2fb21ef4c292c9

7 years agoMerge "Add a new ANALYZER severity group."
Chih-hung Hsieh [Wed, 5 Oct 2016 23:38:22 +0000 (23:38 +0000)]
Merge "Add a new ANALYZER severity group."
am: 89244619ad

Change-Id: Idb6236145ec2a03d8656bc98349f871186dc6847

7 years agoMerge "Add a new ANALYZER severity group."
Chih-hung Hsieh [Wed, 5 Oct 2016 23:31:43 +0000 (23:31 +0000)]
Merge "Add a new ANALYZER severity group."

7 years agoMerge "Add tool to run kati for all products" am: 480678e220
Dan Willemsen [Wed, 5 Oct 2016 23:01:28 +0000 (23:01 +0000)]
Merge "Add tool to run kati for all products" am: 480678e220
am: 652c4b4001

Change-Id: I70645fc341fa1df26635d60731c8877421f73ead

7 years agoMerge "Add tool to run kati for all products"
Dan Willemsen [Wed, 5 Oct 2016 22:58:58 +0000 (22:58 +0000)]
Merge "Add tool to run kati for all products"
am: 480678e220

Change-Id: If2dca50d3e2004927723140ff3de94a368c15590

7 years agoMerge "Add tool to run kati for all products"
Treehugger Robot [Wed, 5 Oct 2016 22:56:03 +0000 (22:56 +0000)]
Merge "Add tool to run kati for all products"

7 years agoAdding excludeFromSuggestions, wear preview project path, and android wear/tv/auto...
Amanda Kassay [Wed, 5 Oct 2016 21:32:49 +0000 (17:32 -0400)]
Adding excludeFromSuggestions, wear preview project path, and android wear/tv/auto/versions projectsw to template

b/31771704 b/31903798 b/31773716

Staged:
https://android-dot-devsite.googleplex.com/about/versions/nougat/index.html
https://android-dot-devsite.googleplex.com/index.html
https://android-dot-devsite.googleplex.com/wear/preview/index.html

Change-Id: Idf9893f9d108c26038ead06c84de771e21b89f37

7 years agoAdd tool to run kati for all products
Dan Willemsen [Mon, 16 May 2016 08:35:57 +0000 (01:35 -0700)]
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

7 years agoAdd a new ANALYZER severity group.
Chih-Hung Hsieh [Wed, 5 Oct 2016 18:53:20 +0000 (11:53 -0700)]
Add a new ANALYZER severity group.

* Separate clang-tidy's clang-analyzer-* warnings from
  other clang-tidy warnings.

Bug: 31559947
Test: build with WITH_TIDY=1 and DEFAULT_GLOBAL_TIDY_CHECKS=*,-readability-*,-google-readability-*
Change-Id: If03c421c9319741ef6588bc0d803b6da0cc4433a

7 years agoFix a nullness warning.
Yunlian Jiang [Wed, 5 Oct 2016 00:23:03 +0000 (17:23 -0700)]
Fix a nullness warning.

This silences a warning null pointer passed as an argument to a
'nonnull' parameter

BUG=None
Test: The warning is gone.

Change-Id: I10a17d4674bfb373d7fe8666863abd5f10a4d11f

7 years agoMerge "Remove redundant LIBART_IMG_{HOST,TARGET}_BASE_ADDRESS" am: 2849d4f9d9
Dan Willemsen [Wed, 5 Oct 2016 17:04:04 +0000 (17:04 +0000)]
Merge "Remove redundant LIBART_IMG_{HOST,TARGET}_BASE_ADDRESS" am: 2849d4f9d9
am: bd1232517d

Change-Id: I58327058566f1a081dbfc2a3eac86bc8a726c7e5

7 years agoMerge "Remove redundant LIBART_IMG_{HOST,TARGET}_BASE_ADDRESS"
Dan Willemsen [Wed, 5 Oct 2016 17:01:34 +0000 (17:01 +0000)]
Merge "Remove redundant LIBART_IMG_{HOST,TARGET}_BASE_ADDRESS"
am: 2849d4f9d9

Change-Id: Ie80905cfc47c7d46bae00e7a0d01907c5401ee34

7 years agoMerge "Remove redundant LIBART_IMG_{HOST,TARGET}_BASE_ADDRESS"
Treehugger Robot [Wed, 5 Oct 2016 16:51:15 +0000 (16:51 +0000)]
Merge "Remove redundant LIBART_IMG_{HOST,TARGET}_BASE_ADDRESS"

7 years agoRemove redundant LIBART_IMG_{HOST,TARGET}_BASE_ADDRESS
Dan Willemsen [Wed, 5 Oct 2016 05:24:17 +0000 (22:24 -0700)]
Remove redundant LIBART_IMG_{HOST,TARGET}_BASE_ADDRESS

These are exported by Soong. Caught by an upcoming change to mark
Soong-exported variables as readonly.

Test: Manual checking that the values are still the same.
Change-Id: I18e2bca588c57809c16a9f0c386aad432bfbee2c

7 years agoMerge "Fix empty mac .toc generation" am: 7bc7704921
Colin Cross [Wed, 5 Oct 2016 02:40:09 +0000 (02:40 +0000)]
Merge "Fix empty mac .toc generation" am: 7bc7704921
am: 8497a34201

Change-Id: I840fa05db353abd5e1adc959246113c04bb5f0f1

7 years agoMerge "Fix empty mac .toc generation"
Colin Cross [Wed, 5 Oct 2016 02:37:38 +0000 (02:37 +0000)]
Merge "Fix empty mac .toc generation"
am: 7bc7704921

Change-Id: Ibe20dff657932eb7851dcbdc2d6dd41ab4f4668d

7 years agoMerge "Fix empty mac .toc generation"
Colin Cross [Wed, 5 Oct 2016 02:35:02 +0000 (02:35 +0000)]
Merge "Fix empty mac .toc generation"

7 years agoMerge "Don't prune $(OUT_DIR) from findleaves.py" am: 6338f23a36
Colin Cross [Wed, 5 Oct 2016 01:44:53 +0000 (01:44 +0000)]
Merge "Don't prune $(OUT_DIR) from findleaves.py" am: 6338f23a36
am: bad4b072de

Change-Id: Ie8fe8c7e3172f25f751a21276807c3046c795d93

7 years agoMerge "Don't prune $(OUT_DIR) from findleaves.py"
Colin Cross [Wed, 5 Oct 2016 01:42:55 +0000 (01:42 +0000)]
Merge "Don't prune $(OUT_DIR) from findleaves.py"
am: 6338f23a36

Change-Id: I9dc9f1c7380e579b54828b5b6dfbe8865ab84726

7 years agoMerge "Don't prune $(OUT_DIR) from findleaves.py"
Colin Cross [Wed, 5 Oct 2016 01:38:04 +0000 (01:38 +0000)]
Merge "Don't prune $(OUT_DIR) from findleaves.py"

7 years agoFix empty mac .toc generation
Colin Cross [Wed, 5 Oct 2016 00:01:29 +0000 (17:01 -0700)]
Fix empty mac .toc generation

If a shared library has no exported symbols grep will return exit code
1 meaning no matches, but this should not be considered an error
during toc generation.

Test: external/clang/build.py
Change-Id: If589da38ad8b844fe1aff4738481cebea75cca42

7 years agoDon't prune $(OUT_DIR) from findleaves.py
Colin Cross [Tue, 4 Oct 2016 23:21:49 +0000 (16:21 -0700)]
Don't prune $(OUT_DIR) from findleaves.py

Pruning $(OUT_DIR) can be overaggressive if $(OUT_DIR) matches the name
of any directory in the source tree that contains Android.mk files.
Pruning $(OUT_DIR) is no longer necessary, as one of the first things
the build system does is put an empty Android.mk file in there to avoid
recursing into it.

Bug: 31941856
Test: m -j OUT_DIR=angler
Change-Id: I7c5e95816f35bd5906845716d56cca76de7fa1ad

7 years agoMerge "Make room for AVB hashtree and metadata." am: 70209ad9f0
David Zeuthen [Tue, 4 Oct 2016 22:39:21 +0000 (22:39 +0000)]
Merge "Make room for AVB hashtree and metadata." am: 70209ad9f0
am: b5b638f7fa

Change-Id: I2bdfd752ff2082b241ad5fbf88e89644d9cd2f3f

7 years agoMerge "Make room for AVB hashtree and metadata."
David Zeuthen [Tue, 4 Oct 2016 22:37:22 +0000 (22:37 +0000)]
Merge "Make room for AVB hashtree and metadata."
am: 70209ad9f0

Change-Id: Ib9da55a7dd11d94f2044493ed932069de6c6eb74

7 years agoMerge "Accept environment variables DEFAULT_*_TIDY_CHECKS" am: 4b4b2da13d
Chih-hung Hsieh [Tue, 4 Oct 2016 22:32:50 +0000 (22:32 +0000)]
Merge "Accept environment variables DEFAULT_*_TIDY_CHECKS" am: 4b4b2da13d
am: 8d4da5f521

Change-Id: If8c4a4d844d4ac2edbd8e173030902cab5ee0f7f

7 years agoMerge "Make room for AVB hashtree and metadata."
David Zeuthen [Tue, 4 Oct 2016 22:32:26 +0000 (22:32 +0000)]
Merge "Make room for AVB hashtree and metadata."

7 years agoMerge "Accept environment variables DEFAULT_*_TIDY_CHECKS"
Chih-hung Hsieh [Tue, 4 Oct 2016 22:30:52 +0000 (22:30 +0000)]
Merge "Accept environment variables DEFAULT_*_TIDY_CHECKS"
am: 4b4b2da13d

Change-Id: I61b05ed9a74875c43ef268d67ee9e2e5d494c2ce

7 years agoMerge "Accept environment variables DEFAULT_*_TIDY_CHECKS"
Chih-hung Hsieh [Tue, 4 Oct 2016 22:25:25 +0000 (22:25 +0000)]
Merge "Accept environment variables DEFAULT_*_TIDY_CHECKS"

7 years agoMake room for AVB hashtree and metadata.
David Zeuthen [Fri, 30 Sep 2016 21:29:22 +0000 (17:29 -0400)]
Make room for AVB hashtree and metadata.

While the system.img images currently built with AVB support verify
correctly, mounting the filesystem content fails. This is because
'avbtool add_hashtree_footer' used to claim some of the unused /
DONT_CARE space for stashing the verity tables and this resulting in the
mapped device ending up being smaller causing the mount failure.

Fix this by leaving enough room for AVB hashtree and metadata before
building the image. This is achieved by moving the AVB hashtree support
into build_image.py and using a just added '--calc_max_image_size'
option to 'avbtool add_hashtree_footer' to figure out how much space to
leave out.

This depends on https://android-review.googlesource.com/#/c/281821/

Bug: 31264226
Test: Mounting dm-verity set up from system.img now works.

Merged-In: I4c5de1004c1059f8c582e76b3b8517d427aa1a87

Change-Id: I945a5f1f6782791736cd319f216cfa6b448fb04d

7 years agoMerge "Enable toc optimization for host builds" am: 5d8c73e373
Colin Cross [Tue, 4 Oct 2016 21:04:25 +0000 (21:04 +0000)]
Merge "Enable toc optimization for host builds" am: 5d8c73e373
am: 4276c12d20

Change-Id: I5bd72f5d2f8e689152d7f496b39afcacf5850371

7 years agoMerge "Enable toc optimization for host builds"
Colin Cross [Tue, 4 Oct 2016 21:02:26 +0000 (21:02 +0000)]
Merge "Enable toc optimization for host builds"
am: 5d8c73e373

Change-Id: I0dae6e9a2d7e759b8c3860d3b4e7a85f04f5aecb

7 years agoMerge "Enable toc optimization for host builds"
Colin Cross [Tue, 4 Oct 2016 20:57:52 +0000 (20:57 +0000)]
Merge "Enable toc optimization for host builds"

7 years agoAccept environment variables DEFAULT_*_TIDY_CHECKS
Chih-Hung Hsieh [Mon, 3 Oct 2016 04:31:04 +0000 (21:31 -0700)]
Accept environment variables DEFAULT_*_TIDY_CHECKS

* Define DEFAULT_GLOBAL_TIDY_CHECKS/DEFAULT_EXTERNAL_VENDOR_TIDY_CHECKS
  only if it is not already defined.

Bug: http://b/27779618
Test: build with WITH_TIDY=1 and define those variables.
Change-Id: I201c9da3769d6ef658a75d4a1bf42ec6816d4069

7 years agoMerge "Fix for non-empty a[name] tags in openJdk based javadocs." am: a8c8dadd09
Przemyslaw Szczepaniak [Tue, 4 Oct 2016 11:48:53 +0000 (11:48 +0000)]
Merge "Fix for non-empty a[name] tags in openJdk based javadocs." am: a8c8dadd09
am: 8dd4374689  -s ours

Change-Id: I57a1638e7d632f6dd50b2d47c078d9371ff2968c

7 years agoMerge "Fix for non-empty a[name] tags in openJdk based javadocs."
Przemyslaw Szczepaniak [Tue, 4 Oct 2016 11:38:51 +0000 (11:38 +0000)]
Merge "Fix for non-empty a[name] tags in openJdk based javadocs."
am: a8c8dadd09

Change-Id: Ide86ed97b14d3c34c6210b9ea9d24b8f3733c090

7 years agoMerge "Fix for non-empty a[name] tags in openJdk based javadocs."
Przemyslaw Szczepaniak [Tue, 4 Oct 2016 11:35:58 +0000 (11:35 +0000)]
Merge "Fix for non-empty a[name] tags in openJdk based javadocs."

7 years agoFix for non-empty a[name] tags in openJdk based javadocs.
Przemyslaw Szczepaniak [Mon, 26 Sep 2016 15:21:13 +0000 (16:21 +0100)]
Fix for non-empty a[name] tags in openJdk based javadocs.

openJdk based android javadoc contains <a name=... tags
that are non-empty. Currently they are being hidden,
causing badly formatted pages for some java.* classes
(missing text and random whitespace blocks).

This change makes the existing a[name] hiding rule
apply only to empty tags.

Test: make docs
Bug: 31700998
Change-Id: Ifa75bbabe308d7aed0cce6165c1113e5a382a121
(cherry picked from commit a7edd92c457879f2719afe6b5d119886b869182f)

7 years agoSupport multiple arch for coverage packaging.
Ryan Campbell [Mon, 3 Oct 2016 18:23:40 +0000 (11:23 -0700)]
Support multiple arch for coverage packaging.

Modify copy rule to support multiple architectures. Use a method
similar to symbols.

Test: make lights.bullhead NATIVE_COVERAGE=true COVERAGE_PATHS=test/vts/hals/light/
Bug: 31911253
Change-Id: Ib3c53b4b305cbfcfd186010c5500b8d678190ddf

7 years agoEnable toc optimization for host builds
Colin Cross [Mon, 3 Oct 2016 23:49:02 +0000 (16:49 -0700)]
Enable toc optimization for host builds

The toc optimization had been disabled for host builds to ensure that
the timestamp of the final binary changed whenever its implementation
changed, in order to support rerunning host tools that were modified
during incremental builds.  However, only the final install rule must be
re-run to update the timestamp, and not the link rule.

Update the shared library install dependencies to use normal
dependencies instead of order-only dependencies for host modules, and
then enable the the toc optimization for host modules.  If the
implementation of a library changes it will be reinstalled, and
libraries or binaries that depend on it will also be reinstalled.

Bug: 26015464
Test: m -j; touch art/disassembler/disassembler_x86.cc; m -j, verify
      out/host/linux-x86/bin/oatdump is updated
Change-Id: I0a14decc1994eb55ad269d841943aef66e320c63

7 years agoMerge "Propagate signals through makeparallel" am: e0f42b41f6
Colin Cross [Tue, 4 Oct 2016 00:30:39 +0000 (00:30 +0000)]
Merge "Propagate signals through makeparallel" am: e0f42b41f6
am: 6f4807da4b

Change-Id: Ia2a896df2782603b68c4dd5d348bcc7f5d661933

7 years agoMerge "exec makeparallel" am: cf8afef2eb
Colin Cross [Tue, 4 Oct 2016 00:30:27 +0000 (00:30 +0000)]
Merge "exec makeparallel" am: cf8afef2eb
am: 46c08db556

Change-Id: I8de8bb26ba46583072dc38248cb51552ae724a0f

7 years agoMerge "Revert "Remove -d keepdepfile from ninja command line"" am: 6548b54dfd
Colin Cross [Tue, 4 Oct 2016 00:30:15 +0000 (00:30 +0000)]
Merge "Revert "Remove -d keepdepfile from ninja command line"" am: 6548b54dfd
am: 88f14b6bb7

Change-Id: Ic92ca83c27066a9f21c11a3b4aec99f3a178e56f

7 years agoMerge "Propagate signals through makeparallel"
Colin Cross [Tue, 4 Oct 2016 00:28:39 +0000 (00:28 +0000)]
Merge "Propagate signals through makeparallel"
am: e0f42b41f6

Change-Id: Ia68f218edd5e57f82bea3269a8fb863077e28082

7 years agoMerge "exec makeparallel"
Colin Cross [Tue, 4 Oct 2016 00:28:28 +0000 (00:28 +0000)]
Merge "exec makeparallel"
am: cf8afef2eb

Change-Id: I77aaad7879d65b233e17a90f0196021105596c6e

7 years agoMerge "Revert "Remove -d keepdepfile from ninja command line""
Colin Cross [Tue, 4 Oct 2016 00:28:16 +0000 (00:28 +0000)]
Merge "Revert "Remove -d keepdepfile from ninja command line""
am: 6548b54dfd

Change-Id: I82aa023b881f277d419fdcdf09cd510b804217c2

7 years agoMerge "Propagate signals through makeparallel"
Colin Cross [Tue, 4 Oct 2016 00:23:54 +0000 (00:23 +0000)]
Merge "Propagate signals through makeparallel"

7 years agoMerge "exec makeparallel"
Colin Cross [Tue, 4 Oct 2016 00:23:47 +0000 (00:23 +0000)]
Merge "exec makeparallel"

7 years agoMerge "Revert "Remove -d keepdepfile from ninja command line""
Colin Cross [Tue, 4 Oct 2016 00:23:37 +0000 (00:23 +0000)]
Merge "Revert "Remove -d keepdepfile from ninja command line""

7 years agoPropagate signals through makeparallel
Colin Cross [Mon, 3 Oct 2016 20:40:32 +0000 (13:40 -0700)]
Propagate signals through makeparallel

Set up a signal handler in makeparallel that will forward SIGHUP,
SIGINT, SIGQUIT, and SIGTERM to the child process.

Bug: 31907490
Test: m -j & killall make; pgrep -a ninja
Test: make makeparallel_test
Change-Id: I306e5335ed1b2c7056804d5da377a2f283877f30

7 years agoexec makeparallel
Colin Cross [Mon, 3 Oct 2016 20:38:27 +0000 (13:38 -0700)]
exec makeparallel

bash doesn't kill children when it receives SIGTERM.  Since makeparallel
is the last command run by the shell, run it with exec to replace the
shell with makeparallel so make can send the signal directly to
makeparallel.

Bug: 31907490
Test: m -j & killall make; pgrep -a makeparallel
Change-Id: If8aeb51ec224234da5f05eae3382ce77f48a57e2

7 years agoRevert "Remove -d keepdepfile from ninja command line"
Colin Cross [Mon, 3 Oct 2016 22:12:08 +0000 (15:12 -0700)]
Revert "Remove -d keepdepfile from ninja command line"

This reverts commit 4aca5715523d1b8a85abde00d7ccc2989c90a96b.

Test: builds
Change-Id: Iddb3517a4596e84404db1738fa95eb15f435a42d

7 years agoMerge "Optimize rebuilds by reducing $(shell) usage" am: f009531772
Dan Willemsen [Mon, 3 Oct 2016 21:27:38 +0000 (21:27 +0000)]
Merge "Optimize rebuilds by reducing $(shell) usage" am: f009531772
am: 466f4f2b9e

Change-Id: Ic26ab0de0b14a400c11fe96c679b2ac60d76aade

7 years agoMerge "Optimize rebuilds by reducing $(shell) usage"
Dan Willemsen [Mon, 3 Oct 2016 21:26:12 +0000 (21:26 +0000)]
Merge "Optimize rebuilds by reducing $(shell) usage"
am: f009531772

Change-Id: I765a59826d058867abe8dd7a851ed06936fd4321

7 years agoMerge "Optimize rebuilds by reducing $(shell) usage"
Dan Willemsen [Mon, 3 Oct 2016 21:20:36 +0000 (21:20 +0000)]
Merge "Optimize rebuilds by reducing $(shell) usage"

7 years agoOptimize rebuilds by reducing $(shell) usage
Dan Willemsen [Sat, 1 Oct 2016 00:30:32 +0000 (17:30 -0700)]
Optimize rebuilds by reducing $(shell) usage

$(shell) isn't particularly fast in Kati, and they have to be executed
both when reading the makefiles and determining whether the ninja file
needs to be regenerated.

Right now, the regen time is mostly hidden because we run them in
parallel. We've also configured it to ignore any commands that contain
"echo", "date", or the output directory. That happens to remove most
commands that contain side effects, so running them in parallel is fine.

But the side effects contain some important things, like the clean up
necessary when switching products. So I'm removing those filters, and
then we'll need to run the shell commands in sequence, since there will
be side-effects. That makes regen take longer though, so use pure-Make
implementations instead of $(shell) where possible.

This set of changes reduces aosp/master aosp_arm64-eng build $(shell)
usage and time by 2/3:

*kati*: func shell time: 3.135095 / 709
*kati*: func shell time: 1.067331 / 236

Bug: 30947985
Test: Manual test lines for math functions
Test: Compare build-aosp_arm64.ninja before/after
Change-Id: I4fc9d6318957992921972994f277c17918e7e1eb

7 years agoMerge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE" am: 847d965b9e
Dan Willemsen [Sat, 1 Oct 2016 01:52:17 +0000 (01:52 +0000)]
Merge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE" am: 847d965b9e
am: 8c42bd3ae4

Change-Id: I01c6bb2333ac66f266dac5755c73a1ab0f5161d1

7 years agoMerge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE"
Dan Willemsen [Sat, 1 Oct 2016 01:48:46 +0000 (01:48 +0000)]
Merge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE"
am: 847d965b9e

Change-Id: Iab6362844a327f559a5471605ba176e075703a72

7 years agoMerge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE"
Dan Willemsen [Sat, 1 Oct 2016 01:43:37 +0000 (01:43 +0000)]
Merge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE"

7 years agoFor ds builds only, emit a separate metadata file for samples only.
Dirk Dougherty [Sat, 1 Oct 2016 01:07:42 +0000 (01:07 +0000)]
For ds builds only, emit a separate metadata file for samples only.
am: a9fcf48078

Change-Id: Ic2b786401a3431896e6441c8c2c61545a6aaea1b

7 years agoFor ds builds only, emit a separate metadata file for samples only.
Dirk Dougherty [Sat, 24 Sep 2016 20:39:16 +0000 (13:39 -0700)]
For ds builds only, emit a separate metadata file for samples only.

Change-Id: I95c03a10cca586c6675f98664479ba8bf2e43576