aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-23Snap for 7483611 from 0c94c3ec6cdcd62683436ffff016d9bfa114179b to ↵android-mainline-12.0.0_r26android-mainline-12.0.0_r2aml_doc_310851020android12-mainline-documentsui-releaseAndroid Build Coastguard Worker
mainline-documentsui-release Change-Id: I6b32fd146716332182edf29a692aac88965337ed
2021-06-22Revert "Throw an error if androidboot.hardware is used for bootconfig" am: ↵Devin Moore
36b659550e Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15054410 Change-Id: I4fff3e1d85a01c46bcbd397ea38465ef41094f3f
2021-06-21Revert "Throw an error if androidboot.hardware is used for bootconfig"Devin Moore
This reverts commit 2e43e34d535ad9030885be9f5942d0c29f569c2e. The kernel bootconfig feature has been updated to handle mixed subkeys and values, so androidboot.hardware is ok to use now. Test: build and boot cuttlefish with 'hardware=cutf_vm' Test: build and boot cuttlefish with 'androidboot.hardware=cutf_vm' Bug: 191502832 Merged-In: I7c3f330a73abe6cf1fb7d14aaaa6cbc3e874a4aa Change-Id: I7c3f330a73abe6cf1fb7d14aaaa6cbc3e874a4aa
2021-06-21Snap for 7478028 from b68b9e0e6554dda7cabd9bb50a536ac17c33aca8 to ↵android-build-team Robot
mainline-documentsui-release Change-Id: If907c05eceae9320494ac56ee389be163cc77cc0
2021-06-21Merge "Disable build-time debugfs restrictions on GSI builds" into sc-dev ↵TreeHugger Robot
am: 122a00734b Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15028539 Change-Id: I9dcb9d8513d021d39477fd17a034d6af850a39fa
2021-06-21Merge "Disable build-time debugfs restrictions on GSI builds" into sc-devTreeHugger Robot
2021-06-18Disable build-time debugfs restrictions on GSI buildsHridya Valsaraju
These restrictions enable macros that disable sepolicy access to debugfs for unauthorized clients on S-launching devices. However, since the Android S GSI build must also be fully functional on earlier devices that could have possibly depended on debugfs, disable the build-time restrictions on GSI builds. Bug: 184381659 Test: make Change-Id: I583693df5c30d9bab28f76a6c1e4e9db8e5fd89f Merged-In: I583693df5c30d9bab28f76a6c1e4e9db8e5fd89f
2021-06-17Merge changes Ie63d08ac,Ia7f8200c into sc-dev am: c66099dcc6TreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15008279 Change-Id: I3ebe3f8763533ffdc960ef49c7fd00bb86e49643
2021-06-17Merge changes Ie63d08ac,Ia7f8200c into sc-devTreeHugger Robot
* changes: Fix typo in droidcore-unbundled. Introduce droidcore-unbundled target
2021-06-17Merge "Remove mainline boot.img from GSI targets" into sc-dev am: e77729e02bTreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14965951 Change-Id: I0ef97f28d5a48fabb61f09b2be022f98a80bc630
2021-06-17Merge "Remove mainline boot.img from GSI targets" into sc-devTreeHugger Robot
2021-06-17Fix typo in droidcore-unbundled.Bill Peckham
Test: manual inspection. Bug: 191304308 Change-Id: Ie63d08acff0b9accfafd906a43bd18cbef5471a3
2021-06-16Merge "Add ro.vendor.build.dont_use_vabc to disable VABC OTA" into sc-dev ↵TreeHugger Robot
am: 6e2acf1c60 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14970372 Change-Id: Ic4d5b657561ae353b1806af88900d44838c28366
2021-06-16Merge "Add ro.vendor.build.dont_use_vabc to disable VABC OTA" into sc-devTreeHugger Robot
2021-06-16Introduce droidcore-unbundled targetBill Peckham
The droidcore-unbundled target replaces the droidcore target when TARGET_BUILD_UNBUNDLED_IMAGE=true. This target is similar to droidcore in terms of dependencies, but it has a smaller set of dist files. The intention is to use TARGET_BUILD_UNBUNDLED_IMAGE=true with a VSDK-using vendor build to supply Java dependencies from prebuilts to avoid building (or needing) Java framework sources. Test: build with and without TARGET_BUILD_UNBUNDLED_IMAGE=true Test: m nothing dist (before patch) Test: m nothing dist (after patch) Test: m nothing dist TARGET_BUILD_UNBUNDLED_IMAGE=true (after patch) Test: examine ninja build graph for previous 3 tests Bug: 188176942 Bug: 187064252 Change-Id: Ia7f8200c1bb1aaaa57c177d1698a114efe26bec7 (cherry picked from commit 0a30cc41bc8acd25058d9751a75184cb9504b93b)
2021-06-15Remove mainline boot.img from GSI targetsSzuWei Lin
Originally, the mainline kernel is for Android12. The mainline kernel is changing to the next Android version. We don't need to includes mainline boot.img in GSI targets. Bug: 191120961 Test: TH and check the built result Change-Id: Icd7677f362077eb675760d51a8f01c5db8baf7e1
2021-06-15[automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: ↵Paul Scovanner
731c612c5a am: 2b5cc45a3b am: d4f2c30487 -s ours am: 4c6a6534b5 -s ours am: c2c92bc5c3 -s ours am: acc10d23e1 -s ours am skip reason: Merged-In Ieba9625ca0ccedf285209954f1e766b20455c32f with SHA-1 f5139e3087 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096 Change-Id: Id98fff06b5ac9f5747240a1e65242fa258175ba8
2021-06-15[automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: ↵Paul Scovanner
731c612c5a am: 2b5cc45a3b am: d4f2c30487 -s ours am: 4c6a6534b5 -s ours am: 99c5b6455d -s ours am: 0c8423765d -s ours am skip reason: Merged-In Ieba9625ca0ccedf285209954f1e766b20455c32f with SHA-1 f5139e3087 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096 Change-Id: I786c154d932eed8165417a925de2592f25a3c9e9
2021-06-15[automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: ↵Paul Scovanner
731c612c5a am: 2b5cc45a3b am: d4f2c30487 -s ours am: 4c6a6534b5 -s ours am: c2c92bc5c3 -s ours am skip reason: Merged-In Ieba9625ca0ccedf285209954f1e766b20455c32f with SHA-1 f5139e3087 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096 Change-Id: Id998e7d3494e7f20ab5fe56ec26c3644017880ca
2021-06-15[automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: ↵Paul Scovanner
731c612c5a am: 2b5cc45a3b am: d4f2c30487 -s ours am: 4c6a6534b5 -s ours am: 99c5b6455d -s ours am skip reason: Merged-In Ieba9625ca0ccedf285209954f1e766b20455c32f with SHA-1 f5139e3087 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096 Change-Id: I298831d046a3e68ed0015d07f730811577de9c44
2021-06-15[automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: ↵Paul Scovanner
731c612c5a am: 2b5cc45a3b am: d4f2c30487 -s ours am: 4c6a6534b5 -s ours am skip reason: Merged-In Ieba9625ca0ccedf285209954f1e766b20455c32f with SHA-1 f5139e3087 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096 Change-Id: I56feff4d4b4025cb6a97932ba81c37f51f670688
2021-06-15[automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: ↵Paul Scovanner
731c612c5a am: 2b5cc45a3b am: d4f2c30487 -s ours am: 4c6a6534b5 -s ours am skip reason: Merged-In Ieba9625ca0ccedf285209954f1e766b20455c32f with SHA-1 f5139e3087 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096 Change-Id: I23c435730fd123c983d82dee6e83d7112d633615
2021-06-15[automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: ↵Paul Scovanner
731c612c5a am: 2b5cc45a3b am: d4f2c30487 -s ours am skip reason: Merged-In Ieba9625ca0ccedf285209954f1e766b20455c32f with SHA-1 f5139e3087 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096 Change-Id: Ic14d7d2f3f00bc26d7ca45f5705e6b60eda6a04d
2021-06-15Update Security String to 2021-08-01 am: 719f8e6ff2 am: 731c612c5a am: ↵Paul Scovanner
2b5cc45a3b Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096 Change-Id: I83c72777cf01ff01eb99c08f48efa1522fb147e5
2021-06-15Update Security String to 2021-08-01 am: 719f8e6ff2 am: 731c612c5aPaul Scovanner
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096 Change-Id: I43332aebc1ada9a38ea4896e3533d50c51b0871a
2021-06-15Update Security String to 2021-08-01 am: 719f8e6ff2Paul Scovanner
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096 Change-Id: Idbfb1d004c6dc78491713cdc5904463c3e4e33af
2021-06-15Merge "[DO NOT MERGE] platform/build/make - S is now REL" into sc-dev am: ↵Jeff Sharkey
4ef2e34cb5 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14884214 Change-Id: I6bc8797c4db4c0326dc1c606eee43b674484aa9c
2021-06-15[DO NOT MERGE] platform/build/make - S is now REL am: 25d421446dJeff Sharkey
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14884214 Change-Id: Id6a8f743315b56fe227254d593a3a6243370c6c7
2021-06-15Merge "[DO NOT MERGE] platform/build/make - S is now REL" into sc-devJeff Sharkey
2021-06-15Merge "Use NetworkStack instead of NetworkStackNext" into sc-dev am: 4ba373fe0fRemi NGUYEN VAN
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14943952 Change-Id: I661323b51e1b0eb625183ed5a27ac42479b9c955
2021-06-15Merge "Use NetworkStack instead of NetworkStackNext" into sc-devRemi NGUYEN VAN
2021-06-14Add ro.vendor.build.dont_use_vabc to disable VABC OTAKelvin Zhang
This prop is owned by OEM, OEM can set this if they want to disable VABC. Test: m dist, make sure generated OTA has VABC disabled Bug: 185400304 Change-Id: Iceb2fb1f399d38a51722352a86ddf68af05fa24e Merged-In: Iceb2fb1f399d38a51722352a86ddf68af05fa24e
2021-06-14Update Security String to 2021-08-05 am: f5139e3087 am: 7d9208ac9f am: ↵Paul Scovanner
2585969307 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269 Change-Id: Ic6697b8772cab236ec480cf6e9d797b5fccc15eb
2021-06-14Update Security String to 2021-08-05 am: f5139e3087 am: 7d9208ac9fPaul Scovanner
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269 Change-Id: I48d91cf260c5b383baa9fde99c01d945977aea85
2021-06-14Update Security String to 2021-08-05 am: f5139e3087 am: 7e1e5ad8ff am: ↵Paul Scovanner
073480991e Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269 Change-Id: I51e2e4a71bd2d7910dff41d9d317c85f1a98f5b3
2021-06-14Merge "Handles capex in signing script" into sc-dev am: 91b8435347Baligh Uddin
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14950211 Change-Id: I758756dfb078f3f045670315d03aa64a15af51c1
2021-06-14Update Security String to 2021-08-05 am: f5139e3087 am: 7e1e5ad8ffPaul Scovanner
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269 Change-Id: Ifcfa2fd56abfd942b4af0a9a95e0150b95a0263f
2021-06-14Merge "Handles capex in signing script" into sc-devBaligh Uddin
2021-06-14Update Security String to 2021-08-05 am: f5139e3087Paul Scovanner
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269 Change-Id: I5766ee11c2b1717f0aedd4895ce01108687c7d6c
2021-06-14Update Security String to 2021-08-05 am: f5139e3087Paul Scovanner
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269 Change-Id: Icbeccbd10e0496e7a38720f165b0868954939a51
2021-06-14Update Security String to 2021-08-01Paul Scovanner
Bug: 191053489 Change-Id: I704c163481698332aea96919eea01209acedb133 Merged-In: Ieba9625ca0ccedf285209954f1e766b20455c32f
2021-06-14Update Security String to 2021-08-05Paul Scovanner
Bug: 191053489 Change-Id: Ieba9625ca0ccedf285209954f1e766b20455c32f
2021-06-14Use NetworkStack instead of NetworkStackNextRemi NGUYEN VAN
Now that NetworkStack has bumped its target SDK to 31, use it instead of the development SDK NetworkStackNext binary. In practice NetworkStack and NetworkStackNext are currently identical, as "current" is now SDK 31 in S branches, and NetworkStackNext does not contain any T-specific code yet. This change should not be merged in development branches downstream of AOSP. Bug: 189581241 Test: device boots, has connectivity Merged-In: Ia9f58c5986c717cb2882e2fc4daadb2b3874c6b5 Change-Id: I990c76da41d56c8756835b5743e1666d1382f796
2021-06-12Handles capex in signing scriptTianjie
Today, the signing script simply ignores capex files, because it looks for hardcoded '.apex' suffix. Add support to handle capex as well. Bug: 190574334 Test: Sign a target file locally Change-Id: I3085ca7b0396a4fbf1b220f7de44d4eafb60c3d8 (cherry picked from commit 4d48d50036e71ccb31cf05326417ee084fd7583a)
2021-06-10[DO NOT MERGE] platform/build/make - S is now RELJeff Sharkey
Bug: 171506470 Test: Build Change-Id: I98536ff83aab23cfaf5553a57a8a3b8264878847
2021-06-10Merge "Move PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to default_art_config.mk." ↵Artur Satayev
into sc-dev am: 7a7b416b81 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14901110 Change-Id: Ibfe98d2073caf8a2a40c0e64888bef5acbe2c3b3
2021-06-10Merge "Move PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to default_art_config.mk." ↵Artur Satayev
into sc-dev
2021-06-09[automerger skipped] [CP] Remove unit tests jar from suites am: 9a6e4270bc ↵Julien Desprez
-s ours am: 6f04506f42 -s ours am skip reason: Merged-In Ie808c7422e35c48c9392f7179806745ef392de64 with SHA-1 67e5ec6202 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14910114 Change-Id: I48f64acbc3ed1cc59005e5a3f7a0fc297d6d8954
2021-06-09Merge "Missing required packages for f2fs when building ota package" into ↵Jaegeuk Kim
sc-dev am: 6279b6c511 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14910115 Change-Id: I827851875ade72bf2b4962c269e4092fe5e41b98
2021-06-09[automerger skipped] [CP] Remove unit tests jar from suites am: 9a6e4270bc ↵Julien Desprez
-s ours am skip reason: Merged-In Ie808c7422e35c48c9392f7179806745ef392de64 with SHA-1 67e5ec6202 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14910114 Change-Id: I963b2d70dd3ab85ba6bce6ca2f51d76b6d2e27a6
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 06:05:07 +0000