OSDN Git Service
Dan Willemsen [Fri, 7 Oct 2016 01:21:07 +0000 (01:21 +0000)]
Merge "Use ASAN prebuilts if SANITIZE_HOST includes address" am:
daba887656 am:
3a14d45f83
am:
b4cfe8c7f9
Change-Id: Ie4ef75194162b8b0aa3efc4dd3b8f6a883115116
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
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"
Dan Willemsen [Thu, 6 Oct 2016 23:53:30 +0000 (23:53 +0000)]
Merge "Replace product variable stashing with .KATI_READONLY" am:
157ad04cfc am:
9d2208441c
am:
34d8c31258
Change-Id: Idc49bb5ad4890c368762cd73ac34e995b2633d1d
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
Ryan Campbell [Thu, 6 Oct 2016 23:42:59 +0000 (23:42 +0000)]
Merge "Support multiple arch for coverage packaging." am:
56b5030eac am:
2882b0aff1
am:
248a9768c7
Change-Id: I12526870d123ccb34d65d63899268d843734b87d
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."
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 17:45:28 +0000 (17:45 +0000)]
Merge "Remove obsolete BOARD_BVB_ENABLE reference" into nyc-mr1-dev-plus-aosp
Dan Willemsen [Thu, 6 Oct 2016 17:26:19 +0000 (10:26 -0700)]
Remove obsolete BOARD_BVB_ENABLE reference
Test: None
Change-Id: Ic6af0ecb0bb6989501189344f9e57d21c4ced0bb
Amanda Kassay [Thu, 6 Oct 2016 17:03:03 +0000 (17:03 +0000)]
Adding excludeFromSuggestions, wear preview project path, and android wear/tv/auto/versions projectsw to template am:
b5c04107af am:
858aa63148 am:
cb5021e842
am:
9d22bd1c63
Change-Id: Idb2973785a014a36f5736f4fac7ff6002b20ad11
Amanda Kassay [Thu, 6 Oct 2016 17:00:02 +0000 (17:00 +0000)]
Adding excludeFromSuggestions, wear preview project path, and android wear/tv/auto/versions projectsw to template am:
b5c04107af am:
858aa63148
am:
cb5021e842
Change-Id: I899a771e0743eb6ce0eb027e4511343cf83d6624
Amanda Kassay [Thu, 6 Oct 2016 16:55:32 +0000 (16:55 +0000)]
Adding excludeFromSuggestions, wear preview project path, and android wear/tv/auto/versions projectsw to template am:
b5c04107af
am:
95bf07b069
Change-Id: I58488322e94b7e1ece1f77fdc600bc1fac6442b0
Amanda Kassay [Thu, 6 Oct 2016 16:55:32 +0000 (16:55 +0000)]
Adding excludeFromSuggestions, wear preview project path, and android wear/tv/auto/versions projectsw to template am:
b5c04107af
am:
858aa63148
Change-Id: I6f7afd6d2c9a8b5deea04948468ddf1ccf8a6db2
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
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: I11d773f8ca2ca9b4b20a659432d39f8c4adbef2d
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
Chih-hung Hsieh [Wed, 5 Oct 2016 23:43:52 +0000 (23:43 +0000)]
Merge "Add a new ANALYZER severity group." am:
89244619ad am:
8a2f279b37
am:
9a838ef507
Change-Id: I44d24577700403f26544a443fc47f1453daa1010
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
Akshay Thakker [Wed, 5 Oct 2016 23:33:01 +0000 (23:33 +0000)]
Merge "Set N-MR1 to version 7.1.1." into nyc-mr1-dev am:
d22aeb6899
am:
409680df30
Change-Id: I186eedbaa1c5bec8f946481288a8bfbf38e1abe0
Chih-hung Hsieh [Wed, 5 Oct 2016 23:31:43 +0000 (23:31 +0000)]
Merge "Add a new ANALYZER severity group."
Akshay Thakker [Wed, 5 Oct 2016 23:30:14 +0000 (23:30 +0000)]
Merge "Set N-MR1 to version 7.1.1." into nyc-mr1-dev
am:
d22aeb6899
Change-Id: I6ddf3c8cfc55412458e8dc5720b44154278c9a4d
Akshay Thakker [Wed, 5 Oct 2016 23:26:38 +0000 (23:26 +0000)]
Set N-MR1 to version 7.1.1. am:
d634094543
am:
0de91e9bf3
Change-Id: Ibc4c5102bf8294b0f446d80abc6e1eabe0267ac2
Akshay Thakker [Wed, 5 Oct 2016 23:23:37 +0000 (23:23 +0000)]
Set N-MR1 to version 7.1.1.
am:
d634094543
Change-Id: I2976fd1363597b632482de6c2f9cbdc4166c7a03
TreeHugger Robot [Wed, 5 Oct 2016 23:17:38 +0000 (23:17 +0000)]
Merge "Set N-MR1 to version 7.1.1." into nyc-mr1-dev
Dan Willemsen [Wed, 5 Oct 2016 23:04:28 +0000 (23:04 +0000)]
Merge "Add tool to run kati for all products" am:
480678e220 am:
652c4b4001
am:
8c0a4f49a2
Change-Id: I086f181ffcd8291fa950c084f0471686d845eaf7
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
Jakub Adámek [Wed, 5 Oct 2016 20:03:46 +0000 (20:03 +0000)]
Merge "Install runtime resource overlay without subdir." into cw-f-dev
am:
84973f87e6
Change-Id: I8759edae3cda8fdb81a541126fe52b3beb19355f
Jakub Adamek [Wed, 5 Oct 2016 20:03:45 +0000 (20:03 +0000)]
Install runtime resource overlay without subdir.
am:
a08a1015bc
Change-Id: I1ca2e029b79bf125145d2031a722914fe24dd299
Jakub Adámek [Wed, 5 Oct 2016 19:57:22 +0000 (19:57 +0000)]
Merge "Install runtime resource overlay without subdir." into cw-f-dev
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
Dan Willemsen [Wed, 5 Oct 2016 17:25:36 +0000 (17:25 +0000)]
Package up proguard jack_dictionary am:
ea99c1da30
am:
73cead3e89
Change-Id: I1603210ad74cb5fba2272c58b79abf6d41ec26ca
Dan Willemsen [Wed, 5 Oct 2016 17:22:34 +0000 (17:22 +0000)]
Package up proguard jack_dictionary
am:
ea99c1da30
Change-Id: If2abc83918a7e1e229ff5233f7d49416d082a663
Dan Willemsen [Wed, 5 Oct 2016 17:07:06 +0000 (17:07 +0000)]
Merge "Remove redundant LIBART_IMG_{HOST,TARGET}_BASE_ADDRESS" am:
2849d4f9d9 am:
bd1232517d
am:
d0d4c9ad9a
Change-Id: Id050ecbcb5192fb0a5370f18c87d329fffdcd176
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"
Jakub Adamek [Mon, 3 Oct 2016 08:56:16 +0000 (09:56 +0100)]
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
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:42:38 +0000 (02:42 +0000)]
Merge "Fix empty mac .toc generation" am:
7bc7704921 am:
8497a34201
am:
02f33e2457
Change-Id: Iad956e6316f91a666d976c718cf1af2c0caca508
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:47:24 +0000 (01:47 +0000)]
Merge "Don't prune $(OUT_DIR) from findleaves.py" am:
6338f23a36 am:
bad4b072de
am:
6f8ca7f502
Change-Id: I96360f13b75b4895545585a1019c703928cc8631
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"
Dan Willemsen [Thu, 1 Sep 2016 18:02:43 +0000 (11:02 -0700)]
Package up proguard jack_dictionary
Bug:
31182185
Bug:
31240674
Test: m dist in an unbundled branch
(cherry picked from commit
b6c061e9ffa5208b0b2dae0a5a88694925c6b527)
Change-Id: I7ee1ba076cfa03f294f8231f6bdd8fa8df5557af
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:53:34 +0000 (18:53 -0400)]
resolve merge conflicts of
86180eb to nyc-mr1-dev-plus-aosp
Change-Id: Ia4bfb2571bac509cebe22f70ff43e6696f832423
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:34:50 +0000 (22:34 +0000)]
Merge "Accept environment variables DEFAULT_*_TIDY_CHECKS" am:
4b4b2da13d am:
8d4da5f521
am:
8a81b9c5a0
Change-Id: I04d9acb6b623c7e54a0f8d2bcd2cb8c3d3897cdd
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:08:47 +0000 (21:08 +0000)]
Merge "Enable toc optimization for host builds" am:
5d8c73e373 am:
4276c12d20
am:
e4e04c2f92
Change-Id: I4db91a8f0893faa317ec7afb2e3f5d84dfcc91cf
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"
Dan Willemsen [Tue, 4 Oct 2016 17:38:41 +0000 (17:38 +0000)]
Support dist-ing the userdatatarball am:
bee409ba50
am:
932a406948
Change-Id: Ifd75cef28ff627c0f52d43c31a5dc376f9d7703d
Dan Willemsen [Tue, 4 Oct 2016 17:37:25 +0000 (17:37 +0000)]
Support dist-ing the userdatatarball
am:
bee409ba50
Change-Id: I659273a8d5f085ca1f3e5291b028847ee58665d4
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
Dan Willemsen [Tue, 16 Aug 2016 23:36:05 +0000 (16:36 -0700)]
Support dist-ing the userdatatarball
So that we can get to the contents of userdata from the build server
without extracting the image.
Bug:
27719200
Test: m userdatatarball dist
(cherry-picked from
69af2e4102d3af3f5f06e4d7a615d42dbb3446bb)
Change-Id: I1438597bd29df80665571f7dc3b4957b9adde870
Przemyslaw Szczepaniak [Tue, 4 Oct 2016 11:50:57 +0000 (11:50 +0000)]
Merge "Fix for non-empty a[name] tags in openJdk based javadocs." am:
a8c8dadd09 am:
8dd4374689 -s ours
am:
780ab61160
Change-Id: Ic879384fb73a72b280e2be883220253c6262eb0b
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
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
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:34:44 +0000 (00:34 +0000)]
Merge "Propagate signals through makeparallel" am:
e0f42b41f6 am:
6f4807da4b
am:
fd00ed23a9
Change-Id: I322f8cecc72e64a6c318e04950c0d200c7f9ef6b
Colin Cross [Tue, 4 Oct 2016 00:34:30 +0000 (00:34 +0000)]
Merge "exec makeparallel" am:
cf8afef2eb am:
46c08db556
am:
74e1ccf614
Change-Id: I3fc58de48d785c5d222003ef4f4a12307a149efc
Colin Cross [Tue, 4 Oct 2016 00:34:18 +0000 (00:34 +0000)]
Merge "Revert "Remove -d keepdepfile from ninja command line"" am:
6548b54dfd am:
88f14b6bb7
am:
d46f4795ef
Change-Id: I49c3fe05eba8e4db5a1e4caec89dd41d3cde9d28
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
Colin Cross [Tue, 4 Oct 2016 00:30:27 +0000 (00:30 +0000)]
Merge "exec makeparallel" am:
cf8afef2eb
am:
46c08db556
Change-Id: I8de8bb26ba46583072dc38248cb51552ae724a0f
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
Colin Cross [Tue, 4 Oct 2016 00:28:39 +0000 (00:28 +0000)]
Merge "Propagate signals through makeparallel"
am:
e0f42b41f6
Change-Id: Ia68f218edd5e57f82bea3269a8fb863077e28082
Colin Cross [Tue, 4 Oct 2016 00:28:28 +0000 (00:28 +0000)]
Merge "exec makeparallel"
am:
cf8afef2eb
Change-Id: I77aaad7879d65b233e17a90f0196021105596c6e
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
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:29:46 +0000 (21:29 +0000)]
Merge "Optimize rebuilds by reducing $(shell) usage" am:
f009531772 am:
466f4f2b9e
am:
c1aff754c4
Change-Id: I0f20752358facf3f41ce690c37f5696928ab5342
OSDN Git Service
