OSDN Git Service
Yunlian Jiang [Tue, 11 Oct 2016 19:48:01 +0000 (19:48 +0000)]
Merge "Fix a nullness warning." am:
b37e81d3cd am:
10b5a9d3f6
am:
ea4f981031
Change-Id: Ie1fd127b89e6bc37514b05051708e69f37ae95f9
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 03:05:28 +0000 (03:05 +0000)]
Merge "Fix an uninitialized value warning." am:
f943e138d7 am:
d7a0b25d66
am:
570063f82d
Change-Id: Iefbe15d4bb48b9e92df1a2223cccec0a32000452
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:40:32 +0000 (02:40 +0000)]
Fix samples metadata concat. am:
8d565ed204 am:
bafc0b1baf am:
20e91f4e7a
am:
3dc35a0148
Change-Id: I1dcbc4eadda8cf03bbad1c4278efdd6dad0c6eaf
Dirk Dougherty [Sat, 8 Oct 2016 02:35:33 +0000 (02:35 +0000)]
Fix samples metadata concat. am:
8d565ed204 am:
bafc0b1baf
am:
20e91f4e7a
Change-Id: I7e77f030b6dc45da3b22459bbd5871ff42285ba8
Dirk Dougherty [Sat, 8 Oct 2016 02:31:32 +0000 (02:31 +0000)]
Fix samples metadata concat. am:
8d565ed204
am:
22fe7409a4
Change-Id: I08418dfb23d225fa73ed21cb0704b69c2c8d0028
Dirk Dougherty [Sat, 8 Oct 2016 02:31:32 +0000 (02:31 +0000)]
Fix samples metadata concat. am:
8d565ed204
am:
bafc0b1baf
Change-Id: I21dadb32eeb771aae9c188372d0da1cf4ea16126
Dirk Dougherty [Sat, 8 Oct 2016 02:27:02 +0000 (02:27 +0000)]
Fix samples metadata concat.
am:
8d565ed204
Change-Id: Ic1a7d62fb278022518154f9c8fe3394df620670c
Dirk Dougherty [Sat, 8 Oct 2016 02:27:01 +0000 (02:27 +0000)]
Fix samples metadata concat.
am:
8d565ed204
Change-Id: I02cf4c7c04ac691b71ef48a6e584c8f2b224a6ff
David Zeuthen [Fri, 7 Oct 2016 20:27:34 +0000 (16:27 -0400)]
resolve merge conflicts of
aa126ab to nyc-mr1-dev-plus-aosp
Change-Id: I6e45dff4fcc873a91b6067a04f9fa4e801a1f4c2
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:24:48 +0000 (01:24 +0000)]
Merge "remove use of CTS_TESTCASES_OUT" am:
24dd78a2d7 am:
b5e2ecab4d
am:
30858857a0
Change-Id: Ib5f060e87d8319968795e00bf6259d2ec1690629
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
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
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: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."
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 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:
858aa63148
Change-Id: I6f7afd6d2c9a8b5deea04948468ddf1ccf8a6db2
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: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
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
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
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: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"
OSDN Git Service
