StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63,294 Commits 1 Branch 0 Tags
c92fc3ff9fcc551a73b04cfc3a9de7ace2759bcc
Commit Graph

63294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roland Levillain
85781a7619 Merge "Rename native code coverage paths product variables in Make." am: d160a49df3 am: b502030f63 
Original change: https://android-review.googlesource.com/c/platform/build/+/1325807

Change-Id: I5d132e7781b92814f3e003d73719bf7da4f175c6
 2020-06-15 10:37:09 +00:00
Jiyong Park
bd8b0a4b08 [automerger skipped] Merge "Organize product vars for adding properties" am: cd0c931b89 am: 2e906be272 -s ours 
am skip reason: Change-Id I98f3b5d0da661b3ad75260a23754e655103b7a44 with SHA-1 1ea01c5b24 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1320376

Change-Id: I788022a55e9fd25965679c1187e9bb6138f9a80a
 2020-06-15 10:36:54 +00:00
Roland Levillain
b502030f63 Merge "Rename native code coverage paths product variables in Make." am: d160a49df3 
Original change: https://android-review.googlesource.com/c/platform/build/+/1325807

Change-Id: Ia7fdcf8a57ccf9948ec2a5ab05ddd6d1c9b1a7ef
 2020-06-15 10:18:46 +00:00
Jiyong Park
2e906be272 Merge "Organize product vars for adding properties" am: cd0c931b89 
Original change: https://android-review.googlesource.com/c/platform/build/+/1320376

Change-Id: Id8285f633edac03b629c8426950185f2007cb9f9
 2020-06-15 10:18:30 +00:00
Roland Levillain
d160a49df3 Merge "Rename native code coverage paths product variables in Make." 2020-06-15 10:12:10 +00:00
Jiyong Park
cd0c931b89 Merge "Organize product vars for adding properties" 2020-06-15 10:00:22 +00:00
Roland Levillain
bad8b386e6 Rename native code coverage paths product variables in Make. 
Rename `CoveragePath` and `CoverageExcludePaths` as
`NativeCoveragePath` and `NativeCoverageExcludePaths` (resp.).
Also, populate `NativeCoveragePath` and `NativeCoverageExcludePaths`
from environment variables `NATIVE_COVERAGE_PATHS` and
`NATIVE_COVERAGE_EXCLUDE_PATHS` (resp.).

Test: m nothing
Bug: 158212027
Change-Id: I409dbb04b09744a7bd95a4b69361e858b9f89e23
 2020-06-14 19:14:56 +01:00
Tianjie
17f6ed8b04 Fix the read on a closed zipfile 
When calculating the dynamic fingerprints, we need to reopen the
input file if it's a ZipFile. Because the original object has been
closed, as its scope ends after the with statement.

Bug: 152167826
Test: generate an OTA package with zip input and overrides
Change-Id: I623da3cc5fcc91c6230fb5a6e86517ed995913b7
(cherry picked from commit eb06afb602)
 2020-06-13 14:35:14 -07:00
Luca Stefani
cf82af25f6 rbe: Remove stray / 
Test: use_rbe m
Change-Id: I5c1b1f07ac2079474c0f81935aaa1d3c035c51c4
 2020-06-13 22:38:58 +02:00
Automerger Merge Worker
c5021fcc08 Merge "[automerger skipped] Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET am: 458af2daa1 -s ours am: aece74366f -s ours am: 47c7f7dda8 -s ours" into rvc-qpr-dev-plus-aosp 2020-06-13 04:15:49 +00:00
Automerger Merge Worker
630f7eb62f Merge "[automerger skipped] Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET am: 458af2daa1 am: c5862f0a34 am: a3ec21b896 -s ours" into rvc-qpr-dev-plus-aosp 2020-06-13 04:15:46 +00:00
Dan Willemsen
d461e00280 [automerger skipped] Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET am: 458af2daa1 -s ours am: aece74366f -s ours am: 47c7f7dda8 -s ours 
am skip reason: Change-Id I8f8c006432f3b8120df1f39c98009155fdff32ad with SHA-1 458af2daa1 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11853804

Change-Id: Ice9d7bf5d0a055f2b92659f1348397da55dd997d
 2020-06-13 04:15:44 +00:00
Dan Willemsen
389bad95ca [automerger skipped] Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET am: 458af2daa1 am: c5862f0a34 am: a3ec21b896 -s ours 
am skip reason: Change-Id I8f8c006432f3b8120df1f39c98009155fdff32ad with SHA-1 d120ac68fa is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11853804

Change-Id: Ib7848cfea8b6d4b42467ddfb32719b25f7a7ea56
 2020-06-13 04:15:41 +00:00
Dan Willemsen
72d067bc69 [automerger skipped] Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET am: 458af2daa1 am: c5862f0a34 -s ours am: e72a61e009 -s ours 
am skip reason: Change-Id I8f8c006432f3b8120df1f39c98009155fdff32ad with SHA-1 d120ac68fa is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11853804

Change-Id: If16add1aaba354e6de8758791f70f3a135cd4ca6
 2020-06-13 04:15:37 +00:00
Colin Cross
a1383d8f9d Use inclusive language in build/make 
Bug: 158889297
Test: m checkbuild
Change-Id: I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28
Merged-In: I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28
(cherry picked from commit c3ad80467e)
 2020-06-12 21:10:55 -07:00
Colin Cross
3cd4a076ba Add out/soong/late-${TARGET_PRODUCT}.mk 
Read out/soong/late-${TARGET_PRODUCT}.mk after reading Android.mk files
to allow Soong's makevars singleton to use $(call dist-for-goals).

Bug: 153485543
Test: m lint-check dist
Change-Id: I7754fd1b8dab508c96ad59beed67f0d6c4ff75f0
Merged-In: I7754fd1b8dab508c96ad59beed67f0d6c4ff75f0
(cherry picked from commit 8ca4092ab4)
 2020-06-12 21:07:51 -07:00
Dan Willemsen
a3ec21b896 Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET am: 458af2daa1 am: c5862f0a34 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11853804

Change-Id: Ic4e423b578e13228c8b42a11e733137350836246
 2020-06-13 04:01:34 +00:00
Dan Willemsen
47c7f7dda8 [automerger skipped] Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET am: 458af2daa1 -s ours am: aece74366f -s ours 
am skip reason: Change-Id I8f8c006432f3b8120df1f39c98009155fdff32ad with SHA-1 458af2daa1 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11853804

Change-Id: I33a8d93d7bda3c76d7d38a54be6f264e72be3029
 2020-06-13 04:01:33 +00:00
Dan Willemsen
e72a61e009 [automerger skipped] Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET am: 458af2daa1 am: c5862f0a34 -s ours 
am skip reason: Change-Id I8f8c006432f3b8120df1f39c98009155fdff32ad with SHA-1 d120ac68fa is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11853804

Change-Id: I361ab81a481b5c1e85d55912d386cce4c860a83e
 2020-06-13 04:01:16 +00:00
Dan Willemsen
aece74366f [automerger skipped] Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET am: 458af2daa1 -s ours 
am skip reason: Change-Id I8f8c006432f3b8120df1f39c98009155fdff32ad with SHA-1 d120ac68fa is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11853804

Change-Id: Iade3739acd9e9659e7cf679776788524275e7b67
 2020-06-13 03:47:13 +00:00
Dan Willemsen
c5862f0a34 Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET am: 458af2daa1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11853804

Change-Id: I0968f23fc8491c1a40e869351af98923745a7646
 2020-06-13 03:47:09 +00:00
Tianjie Xu
6c4c07991f Merge "Fix the read on a closed zipfile" am: b5b25409b9 am: 916b0cc0bc am: 31f2d57129 am: e9170431b5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1332612

Change-Id: Ia6fb5da001bcd82ab3f4f51efa401820086947c5
 2020-06-13 03:13:48 +00:00
Treehugger Robot
36e96e6f9a Merge "Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET" am: 9d54fbebcb am: 31508fb715 am: e37255eefa am: 81201723c9 
Original change: https://android-review.googlesource.com/c/platform/build/+/1332834

Change-Id: I5b0b2d91475d427e0d5775d502b0d435110788c0
 2020-06-13 03:12:54 +00:00
Colin Cross
ff3173188b resolve merge conflicts of 4cbab13de1 to rvc-dev-plus-aosp am: 8fae3c8472 am: d3080ae30c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11856223

Change-Id: Ia3db452e24b8817b02a9ca41c8c7ed06db16a434
 2020-06-13 03:12:39 +00:00
Tianjie Xu
e9170431b5 Merge "Fix the read on a closed zipfile" am: b5b25409b9 am: 916b0cc0bc am: 31f2d57129 
Original change: https://android-review.googlesource.com/c/platform/build/+/1332612

Change-Id: I02209c222f54b47d2f278a94eceb5d751ea5a35a
 2020-06-13 02:55:55 +00:00
Treehugger Robot
81201723c9 Merge "Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET" am: 9d54fbebcb am: 31508fb715 am: e37255eefa 
Original change: https://android-review.googlesource.com/c/platform/build/+/1332834

Change-Id: Id029a6dcfd755179d02694ad0ddf038fd1778e5d
 2020-06-13 02:55:36 +00:00
Colin Cross
d3080ae30c resolve merge conflicts of 4cbab13de1 to rvc-dev-plus-aosp am: 8fae3c8472 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11856223

Change-Id: I872b3a015403a01cd8a709bd0d2fe6dfb00dddf4
 2020-06-13 02:55:20 +00:00
Tianjie Xu
31f2d57129 Merge "Fix the read on a closed zipfile" am: b5b25409b9 am: 916b0cc0bc 
Original change: https://android-review.googlesource.com/c/platform/build/+/1332612

Change-Id: Ice5c9ff31052ad32fe66d3ac42c02e72bda6e315
 2020-06-13 02:51:47 +00:00
Treehugger Robot
e37255eefa Merge "Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET" am: 9d54fbebcb am: 31508fb715 
Original change: https://android-review.googlesource.com/c/platform/build/+/1332834

Change-Id: Id8f1151f329fea0d7aa8e3c25de8af3dbba1f8e9
 2020-06-13 02:51:33 +00:00
Colin Cross
8fae3c8472 resolve merge conflicts of 4cbab13de1 to rvc-dev-plus-aosp 
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I12bbaf25876357f564829044b672f042240b2acf
 2020-06-12 17:46:50 -07:00
Tianjie Xu
916b0cc0bc Merge "Fix the read on a closed zipfile" am: b5b25409b9 
Original change: https://android-review.googlesource.com/c/platform/build/+/1332612

Change-Id: I7524b4e9d512a32b89af8d125dc30b731807e282
 2020-06-12 22:55:18 +00:00
Tianjie Xu
b5b25409b9 Merge "Fix the read on a closed zipfile" 2020-06-12 22:38:49 +00:00
Dan Willemsen
458af2daa1 Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET 
Instead of copying the logic (which led to divergences), use the
same list of dependencies for both users of build-recoveryimage-target

Bug: 158774198
Test: treehugger
Test: build-coral.ninja is the same before/after
Change-Id: I8f8c006432f3b8120df1f39c98009155fdff32ad
Merged-In: I8f8c006432f3b8120df1f39c98009155fdff32ad
(cherry picked from commit d120ac68fa)
 2020-06-12 12:26:37 -07:00
SzuWei Lin
f8475cc49f Skip mount /oem on GSI 
GSI self contains the full Android system part. Skip mounting
the oem partition on GSI, which is a part of system.

Bug: 158433698
Test: build aosp_arm64-userdebug.
Test: Check the file /system/system_ext/etc/init/config/skip_mount.cfg
Change-Id: I689e1cc8a68b980d68b1d6ef1d715203db078dc2
 2020-06-12 16:25:44 +08:00
Tianjie
eb06afb602 Fix the read on a closed zipfile 
When calculating the dynamic fingerprints, we need to reopen the
input file if it's a ZipFile. Because the original object has been
closed.

Bug: 152167826
Test: generate an OTA package with zip input and overrides
Change-Id: I623da3cc5fcc91c6230fb5a6e86517ed995913b7
 2020-06-11 22:51:07 -07:00
Treehugger Robot
31508fb715 Merge "Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET" am: 9d54fbebcb 
Original change: https://android-review.googlesource.com/c/platform/build/+/1332834

Change-Id: I9a2f8e6ab0d1cede6702395a1c29583482f42736
 2020-06-12 04:37:52 +00:00
Treehugger Robot
9d54fbebcb Merge "Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET" 2020-06-12 04:22:25 +00:00
Yo Chiang
267636cfe1 Merge "Remove default GSI libnfc-nci.conf" am: 2294009766 am: b1f03ab796 am: d0935e46f5 am: aaf84fd24e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1322636

Change-Id: I67e6806f528d6f318334b58f0213affa1b703c2b
 2020-06-12 03:51:26 +00:00
Treehugger Robot
4cbab13de1 Merge "Use inclusive language in build/make" am: 2158d2ec6b 
Original change: https://android-review.googlesource.com/c/platform/build/+/1331933

Change-Id: I4e18a8ac71d0bd62a5210e44ce393c476c28b810
 2020-06-12 03:34:52 +00:00
Yo Chiang
aaf84fd24e Merge "Remove default GSI libnfc-nci.conf" am: 2294009766 am: b1f03ab796 am: d0935e46f5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1322636

Change-Id: I81bc6b62469f01377760da3dab5ed2f80fa3d767
 2020-06-12 03:29:47 +00:00
Treehugger Robot
2158d2ec6b Merge "Use inclusive language in build/make" 2020-06-12 03:19:02 +00:00
Yo Chiang
d0935e46f5 Merge "Remove default GSI libnfc-nci.conf" am: 2294009766 am: b1f03ab796 
Original change: https://android-review.googlesource.com/c/platform/build/+/1322636

Change-Id: I0c7a1a306edb314e52bf3c50cfd6727b97889d04
 2020-06-12 03:11:30 +00:00
Yo Chiang
b1f03ab796 Merge "Remove default GSI libnfc-nci.conf" am: 2294009766 
Original change: https://android-review.googlesource.com/c/platform/build/+/1322636

Change-Id: I27bd2f45fcacd8d26223236771210d251c897675
 2020-06-12 02:50:35 +00:00
Dan Willemsen
d120ac68fa Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET 
Instead of copying the logic (which led to divergences), use the
same list of dependencies for both users of build-recoveryimage-target

Change-Id: I8f8c006432f3b8120df1f39c98009155fdff32ad
Test: treehugger
 2020-06-12 02:39:38 +00:00
Yo Chiang
2294009766 Merge "Remove default GSI libnfc-nci.conf" 2020-06-12 02:37:45 +00:00
TreeHugger Robot
e7c69d3ef7 Merge "iorap: Move the pinner property to product/build.prop" into rvc-dev am: 0ffb2a8265 am: d43c8c83bc am: 59a546357c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11791946

Change-Id: I8e2cad388a8e7d287c7fdc413ba22927ab7337fa
 2020-06-11 23:35:52 +00:00
madym
277760a216 Merge "Revert "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set."" am: cca4dffa6f am: 35e9165b0c am: ae1e6d2275 am: 5822163a81 
Original change: https://android-review.googlesource.com/c/platform/build/+/1331942

Change-Id: I373c0eadf7cae643bb5d5f981262bb1f6cf3297a
 2020-06-11 23:35:44 +00:00
TreeHugger Robot
375f3c1917 Merge "iorap: Move the pinner property to product/build.prop" into rvc-dev am: 0ffb2a8265 am: 1a2d190613 am: e8ce466c7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11791946

Change-Id: Ib59d46d7a54427f46bc71f51ca7e5d4f89ffc89d
 2020-06-11 23:33:22 +00:00
TreeHugger Robot
49cd78a58c Merge "iorap: Move the pinner property to product/build.prop" into rvc-dev am: 0ffb2a8265 am: 1a2d190613 am: ce826918e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11791946

Change-Id: If13f10bcd7b64fcfc64a50edf70b35aa4ecebc3d
 2020-06-11 23:28:50 +00:00
TreeHugger Robot
59a546357c Merge "iorap: Move the pinner property to product/build.prop" into rvc-dev am: 0ffb2a8265 am: d43c8c83bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11791946

Change-Id: Ia06dddc55e6705d449a6b5aa476550117c6d24b6
 2020-06-11 23:10:12 +00:00