OSDN Git Service
Dan Willemsen [Mon, 26 Sep 2016 23:38:55 +0000 (16:38 -0700)]
Remove configuration exported from Soong
Bug:
32244182
Test: build-aosp_angler.ninja is identical before/after (with same env)
Change-Id: Iec2784d1ec5301afe4e2de491dee806551ae3764
Dan Willemsen [Mon, 31 Oct 2016 22:07:37 +0000 (15:07 -0700)]
Pass global tidy configuration to Soong
Bug:
32244182
Test: WITH_TIDY=true mmma -j build/kati
Test: WITH_TIDY=true WITH_TIDY_CHECKS=-*,performance* mmma -j build/kati
Change-Id: Idca86bd114f353449bf80f73d255d7095a99682a
Chih-hung Hsieh [Fri, 28 Oct 2016 20:34:48 +0000 (20:34 +0000)]
Merge "Do not use multiprocessing.Pool when --processes=1."
Treehugger Robot [Fri, 28 Oct 2016 20:04:49 +0000 (20:04 +0000)]
Merge "Move perfprofd installation to PRODUCT_PACKAGES_DEBUG"
Chih-Hung Hsieh [Fri, 28 Oct 2016 17:53:34 +0000 (10:53 -0700)]
Do not use multiprocessing.Pool when --processes=1.
Purpose of this change is not to save some execution time,
but to avoid forking another process. In other applications
that use a wrapper to call this python script, it is difficult
to get overwritten file I/O functions work in a subprocess.
So the wrapper will call warn.py with --processes=1.
Test: run "warn.py --processes=1 build.log"
Change-Id: I5998d5c70d81a456c86eb4002f444a4a60135477
Colin Cross [Thu, 27 Oct 2016 22:35:36 +0000 (15:35 -0700)]
Move perfprofd installation to PRODUCT_PACKAGES_DEBUG
LOCAL_MODULE_TAGS is deprecated, use PRODUCT_PACKAGES_DEBUG instead.
Test: none
Change-Id: I670147f4fe38b02ccafe01b96d8078502404113c
Colin Cross [Wed, 26 Oct 2016 23:26:42 +0000 (23:26 +0000)]
Merge "Revert "Check prebuilt sources during checkbuild""
Colin Cross [Wed, 26 Oct 2016 23:25:57 +0000 (23:25 +0000)]
Revert "Check prebuilt sources during checkbuild"
This reverts commit
ec8fae6f2e11a772fa97fe6baf895222f7ffdf5d.
Revert this until a few oddball branches can be fixed.
Bug:
32332829
Change-Id: Ic95fa50e36cb32a4d29bf765b1f3d8384140fb0b
Colin Cross [Wed, 26 Oct 2016 19:35:31 +0000 (19:35 +0000)]
Merge "Check prebuilt sources during checkbuild"
Pirama Arumuga Nainar [Wed, 26 Oct 2016 17:35:50 +0000 (17:35 +0000)]
Merge "RenderScript-specific build updates for LLVM rebase"
Pirama Arumuga Nainar [Tue, 26 Jul 2016 18:37:14 +0000 (11:37 -0700)]
RenderScript-specific build updates for LLVM rebase
Bug: http://b/
31320715
Use LLVM's RenderScript triples: upstream LLVM now has 32-bit and
64-bit RenderScript triples. Update RS_TRIPLE build variables to use
the new triples.
Switch prebuilt clang used for building RenderScript runtime library to
the latest prebuilts.
Test: Run RenderScript tests (slang, bcc host tests, RsTest, CTS)
Change-Id: I308f6a2183350cfc380228a1eed07ec118d93a46
Tao Bao [Mon, 24 Oct 2016 18:50:14 +0000 (18:50 +0000)]
Merge "releasetools: Support verity signer args."
Treehugger Robot [Sat, 22 Oct 2016 03:02:52 +0000 (03:02 +0000)]
Merge "Cleanup NATIVE_COVERAGE, PRIVATE_ARFLAGS"
Colin Cross [Fri, 21 Oct 2016 17:52:06 +0000 (10:52 -0700)]
Check prebuilt sources during checkbuild
Add prebuilt files as dependencies during checkbuild. This will flag
prebuilt modules that have files that don't exist as errors, and also
fix building soong modules with make native, etc.
Bug:
32332829
Test: m -j checkbuild
Test: m -j host
Change-Id: Ia4e22cb640978c181de039202baf02f4fb5a94d5
Dan Willemsen [Fri, 21 Oct 2016 22:04:12 +0000 (15:04 -0700)]
Cleanup NATIVE_COVERAGE, PRIVATE_ARFLAGS
Disable the NATIVE_COVERAGE code when not in use. Provide the proper
PRIVATE_ variables so that the $DISPLAY environment variable isn't
encoded into the ninja file.
Remove PRIVATE_ARFLAGS, which is never set.
Test: compare build-aosp_flounder.ninja
Test: NATIVE_COVERAGE=true build-aosp_flounder.ninja, inspect
Change-Id: I2a52de440fd991cdc5761ff8bd58a474892d2dfc
Treehugger Robot [Fri, 21 Oct 2016 23:00:35 +0000 (23:00 +0000)]
Merge "Don't pass -Wl,--no-undefined to host targets"
Chih-hung Hsieh [Fri, 21 Oct 2016 05:05:29 +0000 (05:05 +0000)]
Merge "Remove valgrind from the exception list."
Dan Willemsen [Fri, 21 Oct 2016 01:08:50 +0000 (01:08 +0000)]
Merge "Remove variables exported by Soong"
Treehugger Robot [Thu, 20 Oct 2016 23:37:40 +0000 (23:37 +0000)]
Merge "Support Android.bp in mgrep"
Colin Cross [Thu, 20 Oct 2016 19:38:21 +0000 (12:38 -0700)]
Don't pass -Wl,--no-undefined to host targets
Host builds were compiling without -Wl,--no-undefined because of an ASAN
issue. Pass -Wl,--no-undefined for host builds unless sanitzers are
enabled. Also fix LOCAL_ALLOW_UNDEFINED_SYMBOLS on darwin, where
disallowing undefined symbols is the default.
Test: m -j host
Test: m -j SANITIZE_HOST=address host
Bug:
32305815
Change-Id: I0344c321610c55eb8b2092b01e50e4a93a0e85df
Colin Cross [Thu, 20 Oct 2016 21:40:55 +0000 (21:40 +0000)]
Merge "Use default -std values exported from soong"
Wei Wang [Thu, 20 Oct 2016 21:26:45 +0000 (14:26 -0700)]
Support Android.bp in mgrep
This patch enabled Android.bp in mgrep result
Bug:
32313127
Test: mgrep
Change-Id: Ie3171a10ab54322bfc3844d1f629c783286ec212
Colin Cross [Mon, 17 Oct 2016 22:34:29 +0000 (15:34 -0700)]
Use default -std values exported from soong
Test: builds
Change-Id: Ic7b7d226131a2a0ea1f099f8a0fc895448384081
Treehugger Robot [Thu, 20 Oct 2016 17:37:43 +0000 (17:37 +0000)]
Merge "goldfish_setup: grant ifconfig priv_sock_ioctls"
Richard Haines [Thu, 20 Oct 2016 14:47:44 +0000 (15:47 +0100)]
goldfish_setup: grant ifconfig priv_sock_ioctls
The goldfish_setup shell script needs the ability to set the interface
address via ifconfig. This requires SIOCSIFADDR plus other ioctl
permissions, therefore allow the set of priv_sock_ioctls permissions.
Addresses the following denial that stops internet access via browser:
avc: denied { ioctl } for pid=712 comm="ifconfig" path="socket:[1825]"
dev="sockfs" ino=1825 ioctlcmd=8916 scontext=u:r:goldfish_setup:s0
tcontext=u:r:goldfish_setup:s0 tclass=udp_socket permissive=0
Test: With update can access internet via browser.
Change-Id: I77a52c0b72bb0ebe9451f45c346a399c1f61672d
Signed-off-by: Richard Haines <richard_c_haines@btinternet.com>
Ryan Campbell [Thu, 20 Oct 2016 01:01:24 +0000 (01:01 +0000)]
Merge "Define coverage paths using comma-separated list."
Dan Willemsen [Wed, 19 Oct 2016 17:56:49 +0000 (17:56 +0000)]
Merge "For emulator builds preopt system apps even if doing eng build"
Dan Willemsen [Wed, 19 Oct 2016 00:18:14 +0000 (17:18 -0700)]
Remove variables exported by Soong
These are all variables that we export from Soong, and are only used
after Soong's make_vars.mk is read.
Test: Compare build-aosp_flounder.ninja before/after -- only whitespace
Change-Id: Ibb6c6d7bc00ff5840a72c2bba5d97ac4b4724df3
Ryan Campbell [Tue, 18 Oct 2016 17:25:15 +0000 (10:25 -0700)]
Define coverage paths using comma-separated list.
Change COVERAGE_PATHS to access a comma-separated list of paths
instead of a space-separated list to make for easier escaping in
configuration files.
Test: tested using local bullhead build with coverage on lights and nfc
Change-Id: Iec014c8b4fbefcbcc5d865e6acba92bf6364ee3a
Treehugger Robot [Tue, 18 Oct 2016 03:49:49 +0000 (03:49 +0000)]
Merge "Use parallel subprocesses to classify warnings."
Treehugger Robot [Tue, 18 Oct 2016 01:02:05 +0000 (01:02 +0000)]
Merge "Split apart frameworks/compile into sub-projects."
Chih-Hung Hsieh [Tue, 11 Oct 2016 22:25:26 +0000 (15:25 -0700)]
Use parallel subprocesses to classify warnings.
* Add a --processes flag to specify number of parallel processes,
with default multiprocessing.cpu_count().
* Wrap long line to suppress pylint warning.
Test: run warn.py with a large build.log file.
Change-Id: I9a93a9324bc531c1bce741367013051ce40a67fa
Treehugger Robot [Tue, 18 Oct 2016 00:43:09 +0000 (00:43 +0000)]
Merge "Fix bug preventing multi-module native coverage."
Tao Bao [Mon, 17 Oct 2016 23:20:12 +0000 (16:20 -0700)]
releasetools: Support verity signer args.
system/extras/verity/build_verity_metadata.py now accepts
"--signer_args" to specify verity signer args.
Also remove the duplicate "--verity_signer_args" in
add_img_to_target_files.py, as we already have that in common.py.
Bug:
31500665
Test: Building and signing work w/ and w/o --signer_args.
Change-Id: I02f59c50a1ebf15c5505e9fffd5b9bbbbaa785be
Treehugger Robot [Mon, 17 Oct 2016 22:59:16 +0000 (22:59 +0000)]
Merge "Add a dist goal for the NDK."
Ryan Campbell [Mon, 17 Oct 2016 22:43:21 +0000 (15:43 -0700)]
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
Stephen Hines [Mon, 17 Oct 2016 22:39:53 +0000 (15:39 -0700)]
Split apart frameworks/compile into sub-projects.
These projects are all used by RenderScript, but it would be good to
differentiate warnings for each.
Change-Id: I983279d590630175a36075b01e8eec9100c07d26
Test: Ran warn.py
Treehugger Robot [Mon, 17 Oct 2016 21:47:17 +0000 (21:47 +0000)]
Merge "zipalign missing header"
Mark Salyzyn [Mon, 17 Oct 2016 17:20:33 +0000 (10:20 -0700)]
zipalign missing header
Remove assumptions about header side effects
Test: compile
Bug:
30465923
Change-Id: I117567b0f99814b9d9a955b39c56f43f7972cf62
Chih-hung Hsieh [Sat, 15 Oct 2016 01:36:59 +0000 (01:36 +0000)]
Merge "Add more patterns for a finer project warning list."
Treehugger Robot [Sat, 15 Oct 2016 01:04:37 +0000 (01:04 +0000)]
Merge "build: tools: Add json collection of installed files with hashes."
Dan Albert [Fri, 14 Oct 2016 20:23:06 +0000 (13:23 -0700)]
Add a dist goal for the NDK.
Test: make sdk dist
Bug: None
Change-Id: I07dfc73e3cea5afebcf5ed10cf860eb3f33cbff6
Sasha Levitskiy [Tue, 11 Oct 2016 05:48:10 +0000 (22:48 -0700)]
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>
Chih-Hung Hsieh [Fri, 14 Oct 2016 19:27:17 +0000 (12:27 -0700)]
Add more patterns for a finer project warning list.
Bug:
31377083
Test: run warn.py --byproject build.log
Change-Id: I3cad8e24bc97a84f067a162ff728e30fde3c7197
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 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:42:01 +0000 (00:42 +0000)]
Merge "Add -Werror to compile warning free projects."
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"
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: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:36:04 +0000 (15:36 -0700)]
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
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
Treehugger Robot [Tue, 11 Oct 2016 19:29:36 +0000 (19:29 +0000)]
Merge "Fix a nullness warning."
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
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."
Guang Zhu [Fri, 7 Oct 2016 01:15:16 +0000 (01:15 +0000)]
Merge "remove use of CTS_TESTCASES_OUT"
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)
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: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
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:31:43 +0000 (23:31 +0000)]
Merge "Add a new ANALYZER severity group."
Treehugger Robot [Wed, 5 Oct 2016 22:56:03 +0000 (22:56 +0000)]
Merge "Add 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
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
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:35:02 +0000 (02:35 +0000)]
Merge "Fix empty mac .toc generation"
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:32:26 +0000 (22:32 +0000)]
Merge "Make room for AVB hashtree and metadata."
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 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
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."
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)
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
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
Colin Cross [Tue, 4 Oct 2016 00:23:54 +0000 (00:23 +0000)]
Merge "Propagate signals through makeparallel"
Colin Cross [Tue, 4 Oct 2016 00:23:47 +0000 (00:23 +0000)]
Merge "exec makeparallel"
Colin Cross [Tue, 4 Oct 2016 00:23:37 +0000 (00:23 +0000)]
Merge "Revert "Remove -d keepdepfile from ninja command line""
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
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
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
Dan Willemsen [Mon, 3 Oct 2016 21:20:36 +0000 (21:20 +0000)]
Merge "Optimize 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
Dan Willemsen [Sat, 1 Oct 2016 01:43:37 +0000 (01:43 +0000)]
Merge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE"