OSDN Git Service
Alex Deymo [Fri, 14 Oct 2016 03:27:19 +0000 (03:27 +0000)]
Merge changes Ie3d82cfa,I2f808896,I587f400d am:
3b54b69205
am:
120a2cfada
Change-Id: I28970793e3aa1dd79e0862c3dbe34e8539f70e08
Alex Deymo [Fri, 14 Oct 2016 03:27:14 +0000 (03:27 +0000)]
fat16copy: Fix allocation logic when extending directories. am:
a1c977735b
am:
a507800e5f
Change-Id: Ida8f372a1656ff0b4059c8b2d5629ea1b479c9fc
Alex Deymo [Fri, 14 Oct 2016 03:27:09 +0000 (03:27 +0000)]
fat16copy: Sort new directory entries. am:
567c5d0f95
am:
cf24e4b85f
Change-Id: I109b9e0d9f9e3bf6851b575a3b9576282b851c0a
Casey Dahlin [Fri, 14 Oct 2016 03:27:04 +0000 (03:27 +0000)]
Make fat16copy.py add . and .. entries to directories am:
df71efe378
am:
8cf11d1423
Change-Id: I6f2dd99f66ffafffca7161cc578cc08f7c798078
Alex Deymo [Fri, 14 Oct 2016 03:24:15 +0000 (03:24 +0000)]
Merge changes Ie3d82cfa,I2f808896,I587f400d
am:
3b54b69205
Change-Id: Ie2c9e112a993b0bd8acca84f88cdeaba0c798440
Alex Deymo [Fri, 14 Oct 2016 03:24:14 +0000 (03:24 +0000)]
fat16copy: Fix allocation logic when extending directories.
am:
a1c977735b
Change-Id: I5bc6da73f2c5f9dfb9b9e9cf34b77481d45ab911
Alex Deymo [Fri, 14 Oct 2016 03:24:09 +0000 (03:24 +0000)]
fat16copy: Sort new directory entries.
am:
567c5d0f95
Change-Id: I2d7bc7b3e7ed5e0ddf940d490de439ff591c9817
Casey Dahlin [Fri, 14 Oct 2016 03:24:04 +0000 (03:24 +0000)]
Make fat16copy.py add . and .. entries to directories
am:
df71efe378
Change-Id: Idc2516c8a29d62589f355e8bdbbaade170a5cdb5
Alex Deymo [Fri, 14 Oct 2016 03:19:55 +0000 (03:19 +0000)]
Merge changes Ie3d82cfa,I2f808896,I587f400d
* changes:
fat16copy: Fix allocation logic when extending directories.
fat16copy: Sort new directory entries.
Make fat16copy.py add . and .. entries to directories
David Srbecky [Thu, 13 Oct 2016 13:09:40 +0000 (13:09 +0000)]
Merge "Generate SHA-1 build ID for host-generated *.oat files (2/2)." am:
5ccc874ba1
am:
53502853b0
Change-Id: Ifacc968933106ee99db51f25ca197772859a7a41
David Srbecky [Thu, 13 Oct 2016 13:02:40 +0000 (13:02 +0000)]
Merge "Generate SHA-1 build ID for host-generated *.oat files (2/2)."
am:
5ccc874ba1
Change-Id: I4814a46b548db7e8f851745f3b637f7a8c91f652
David Srbecky [Thu, 13 Oct 2016 12:52:31 +0000 (12:52 +0000)]
Merge "Generate SHA-1 build ID for host-generated *.oat files (2/2)."
Chih-hung Hsieh [Thu, 13 Oct 2016 00:59:46 +0000 (00:59 +0000)]
Merge "Add -Werror to compile warning free projects." am:
355e96774b
am:
05388b7618
Change-Id: Ib4613feea14a0edf06f5395b1646a0c148a7a792
Chih-hung Hsieh [Thu, 13 Oct 2016 00:53:15 +0000 (00:53 +0000)]
Merge "Add -Werror to compile warning free projects."
am:
355e96774b
Change-Id: I316018711e079ebce0b5ea19360caa60b762b89d
Chih-hung Hsieh [Thu, 13 Oct 2016 00:42:01 +0000 (00:42 +0000)]
Merge "Add -Werror to compile warning free projects."
Clay Murphy [Wed, 12 Oct 2016 19:15:25 +0000 (19:15 +0000)]
Merge "Update droiddoc templates for build/make move" am:
f8d8458edd
am:
69c640cb2b -s ours
Change-Id: I99ce073a3f20b221f6072f63144545d0b00abc1b
Dan Willemsen [Wed, 12 Oct 2016 19:11:19 +0000 (19:11 +0000)]
Merge "Update droiddoc templates for build/make move" into nyc-dev-plus-aosp
Andreas Gampe [Wed, 12 Oct 2016 18:47:52 +0000 (18:47 +0000)]
Merge "Build: add preloaded-classes and compiled-classes dependency" am:
a0d201bd9a
am:
bc166c799d
Change-Id: I38dc9783c694c82593e7056707a09e520a789aeb
Clay Murphy [Wed, 12 Oct 2016 18:41:35 +0000 (18:41 +0000)]
Merge "Update droiddoc templates for build/make move"
am:
f8d8458edd
Change-Id: I5b803a789b8695f5f5b8776e634c13c290c91c71
Andreas Gampe [Wed, 12 Oct 2016 18:41:22 +0000 (18:41 +0000)]
Merge "Build: add preloaded-classes and compiled-classes dependency"
am:
a0d201bd9a
Change-Id: I28bee3466ab8710ada8d5e6068cdda9fdb1dc3d1
Clay Murphy [Wed, 12 Oct 2016 18:34:23 +0000 (18:34 +0000)]
Merge "Update droiddoc templates for build/make move"
Treehugger Robot [Wed, 12 Oct 2016 18:30:11 +0000 (18:30 +0000)]
Merge "Build: add preloaded-classes and compiled-classes dependency"
Dan Willemsen [Wed, 12 Oct 2016 07:10:33 +0000 (00:10 -0700)]
Update droiddoc templates for build/make move
Since build/ was moved to build/make/, the droiddoc templates now need
another ../ to reach the android root.
Test: m online-sac-docs
Change-Id: I2393f6c791df9b67ccafb4eb047fd8ccc52481cb
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
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
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
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
Andreas Gampe [Wed, 12 Oct 2016 16:35:39 +0000 (09:35 -0700)]
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
Treehugger Robot [Wed, 12 Oct 2016 16:35:34 +0000 (16:35 +0000)]
Merge "Better pattern matching and dump of warning messages."
Treehugger Robot [Wed, 12 Oct 2016 16:34:05 +0000 (16:34 +0000)]
Merge "Normalize warning source file path to relative path."
Dan Willemsen [Wed, 12 Oct 2016 07:10:33 +0000 (00:10 -0700)]
Update droiddoc templates for build/make move
Since build/ was moved to build/make/, the droiddoc templates now need
another ../ to reach the android root.
Test: m online-sac-docs
Change-Id: I2393f6c791df9b67ccafb4eb047fd8ccc52481cb
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
Jeff Sharkey [Wed, 12 Oct 2016 01:23:22 +0000 (01:23 +0000)]
Merge "PRODUCT_PACKAGES: add to tune2fs."
am:
4337794acd
Change-Id: I156f1cb5ccd377785f77399e005bcfab10b5c3b3
Jeff Sharkey [Wed, 12 Oct 2016 01:16:33 +0000 (01:16 +0000)]
Merge "PRODUCT_PACKAGES: add to tune2fs."
Chih-Hung Hsieh [Tue, 11 Oct 2016 22:38:39 +0000 (15:38 -0700)]
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
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
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
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
Yunlian Jiang [Tue, 11 Oct 2016 19:35:31 +0000 (19:35 +0000)]
Merge "Fix a nullness warning."
am:
b37e81d3cd
Change-Id: I0393f42a1d2a0e73e0c29a0e0047479f49982788
Treehugger Robot [Tue, 11 Oct 2016 19:29:36 +0000 (19:29 +0000)]
Merge "Fix a nullness warning."
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
Yunlian Jiang [Tue, 11 Oct 2016 02:53:58 +0000 (02:53 +0000)]
Merge "Fix an uninitialized value warning."
am:
f943e138d7
Change-Id: I9c3a911998740998608690ce885d2826a710b3d4
Treehugger Robot [Tue, 11 Oct 2016 02:43:46 +0000 (02:43 +0000)]
Merge "Fix 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
Dirk Dougherty [Sat, 8 Oct 2016 02:27:02 +0000 (02:27 +0000)]
Fix samples metadata concat.
am:
8d565ed204
Change-Id: Ic1a7d62fb278022518154f9c8fe3394df620670c
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
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
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."
Dirk Dougherty [Fri, 7 Oct 2016 19:12:50 +0000 (12:12 -0700)]
Fix samples metadata concat.
Change-Id: Ie9b616818995b3066d0e65ea1aa30077ed9d82ce
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
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
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
Guang Zhu [Fri, 7 Oct 2016 01:15:16 +0000 (01:15 +0000)]
Merge "remove use of CTS_TESTCASES_OUT"
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
Treehugger Robot [Fri, 7 Oct 2016 01:08:06 +0000 (01:08 +0000)]
Merge "Use ASAN prebuilts if SANITIZE_HOST includes address"
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)
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
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
Treehugger Robot [Thu, 6 Oct 2016 23:41:29 +0000 (23:41 +0000)]
Merge "Replace product variable stashing with .KATI_READONLY"
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
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
Ryan Campbell [Thu, 6 Oct 2016 23:25:08 +0000 (23:25 +0000)]
Merge "Support multiple arch for coverage packaging."
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
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
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
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
Alexey Alexandrov [Mon, 19 Sep 2016 17:54:21 +0000 (10:54 -0700)]
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
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
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
Chih-hung Hsieh [Wed, 5 Oct 2016 23:31:43 +0000 (23:31 +0000)]
Merge "Add a new ANALYZER severity group."
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
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
Treehugger Robot [Wed, 5 Oct 2016 22:56:03 +0000 (22:56 +0000)]
Merge "Add tool to run kati for all products"
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
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
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
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
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
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
Treehugger Robot [Wed, 5 Oct 2016 16:51:15 +0000 (16:51 +0000)]
Merge "Remove 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
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
Colin Cross [Wed, 5 Oct 2016 02:37:38 +0000 (02:37 +0000)]
Merge "Fix empty mac .toc generation"
am:
7bc7704921
Change-Id: Ibe20dff657932eb7851dcbdc2d6dd41ab4f4668d
Colin Cross [Wed, 5 Oct 2016 02:35:02 +0000 (02:35 +0000)]
Merge "Fix empty mac .toc generation"
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
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
Colin Cross [Wed, 5 Oct 2016 01:38:04 +0000 (01:38 +0000)]
Merge "Don't prune $(OUT_DIR) from findleaves.py"
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
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
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
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
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
David Zeuthen [Tue, 4 Oct 2016 22:32:26 +0000 (22:32 +0000)]
Merge "Make room for AVB hashtree and metadata."
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
Chih-hung Hsieh [Tue, 4 Oct 2016 22:25:25 +0000 (22:25 +0000)]
Merge "Accept environment variables DEFAULT_*_TIDY_CHECKS"
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
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
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
Colin Cross [Tue, 4 Oct 2016 20:57:52 +0000 (20:57 +0000)]
Merge "Enable toc optimization for host builds"
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