Commit graph

70667 commits

Author SHA1 Message Date
Inseob Kim
6bcad4a519 Add BUILD_USES_RECOVERY_AS_BOOT to soong config am: 94b0556c4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15070334

Change-Id: Iaae16de89c09cb7b99e5b0addf540860d64fb452
2021-06-24 23:44:14 +00:00
Inseob Kim
3798b390aa Directly create ramdisk dirs in ramdisk image rule am: f3897b668d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15070333

Change-Id: Ideb92d32cb70502b1e917dd8521db2f25fa8ca63
2021-06-24 23:44:07 +00:00
Inseob Kim
69326d77ab Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars am: a9af042d58
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15070332

Change-Id: I1160df4e119644d2022eeca3879e25487c2c30df
2021-06-24 23:44:00 +00:00
Dario Freni
84d3bf7a2f Add MODULE_BUILD_FROM_SOURCE env variable.
When set, module builds will prefer source where applicable.

Bug: 191978129
Test: m; MODULE_BUILD_FROM_SOURCE=true m
Change-Id: Ie7f928674a511a98f17653fa814a42194ee0e9f9
Merged-In: Ie7f928674a511a98f17653fa814a42194ee0e9f9
2021-06-24 17:37:50 +00:00
Jeongik Cha
5612cff4b4 Emit DexPreoptImageLocationsOnDevice as well
Bug: 158843648
Test: check if dexpreopt config for the module defined in mk has
DexPreoptImageLocationsOnDevice field.

Change-Id: Ie8c7b1c8c5a6797f71920d9ce671dde0e1f489a3
Merged-In: Ie8c7b1c8c5a6797f71920d9ce671dde0e1f489a3
(cherry picked from commit 242c436242)
2021-06-24 13:14:29 +00:00
Luke Huang
bdb359aef5 Delete com.android.cronet from base_system
No concrete plan to ship Cronet for now

Bug: 188872256
Test: TH
Merged-In: I86f659de4a956a3186f21a5333781b92b71e7c17
Change-Id: Ic3deabca3794d1541668b45e8e63d99a7345adfd
2021-06-23 08:46:46 +00:00
Inseob Kim
94b0556c4e Add BUILD_USES_RECOVERY_AS_BOOT to soong config
Bug: 190974433
Test: build
Change-Id: I2a0daa6127e94366b7b6cfa5cec0080169a469e3
Merged-In: I2a0daa6127e94366b7b6cfa5cec0080169a469e3
2021-06-23 04:39:04 +00:00
Inseob Kim
f3897b668d Directly create ramdisk dirs in ramdisk image rule
These directories have been created with post install cmds of
init_first_stage. To migrate init_first_stage to Soong, the directory
rules are now written directly in ramdisk image rule.

Bug: 187196593
Test: "m installclean; m" and see ramdisk output
Change-Id: Ic76c325ce102347f20b282572e3edbb5b4359aaf
Merged-In: Ic76c325ce102347f20b282572e3edbb5b4359aaf
2021-06-23 04:38:55 +00:00
Inseob Kim
a9af042d58 Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars
It'll be used from init_first_stage.

Bug: 187196593
Test: build
Change-Id: I4c5374debd56fbf9d11b456498835a9c411d01d6
Merged-In: I4c5374debd56fbf9d11b456498835a9c411d01d6
2021-06-23 04:33:18 +00:00
Devin Moore
0fae78cd7a Revert "Throw an error if androidboot.hardware is used for bootconfig" am: 36b659550e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15054410

Change-Id: I53c39254879e4485eaad229bf05ed3844b231cf3
2021-06-22 18:08:43 +00:00
Devin Moore
36b659550e Revert "Throw an error if androidboot.hardware is used for bootconfig"
This reverts commit 2e43e34d53.

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-21 12:48:24 -07:00
TreeHugger Robot
805eadef1a Merge "Disable build-time debugfs restrictions on GSI builds" into sc-dev am: 122a00734b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15028539

Change-Id: I1bbed31ac76112874863fe7d41fba50855f4709c
2021-06-21 05:22:24 +00:00
TreeHugger Robot
122a00734b Merge "Disable build-time debugfs restrictions on GSI builds" into sc-dev 2021-06-21 04:58:20 +00:00
Hridya Valsaraju
dbc00eb135 Disable build-time debugfs restrictions on GSI builds
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-18 17:50:12 +00:00
TreeHugger Robot
ce53a0ff9e Merge changes Ie63d08ac,Ia7f8200c into sc-dev am: c66099dcc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15008279

Change-Id: I260893b558d643c29983d3c5f217c0b136237714
2021-06-17 15:19:19 +00:00
TreeHugger Robot
c66099dcc6 Merge changes Ie63d08ac,Ia7f8200c into sc-dev
* changes:
  Fix typo in droidcore-unbundled.
  Introduce droidcore-unbundled target
2021-06-17 15:01:07 +00:00
TreeHugger Robot
8c10353f7b Merge "Remove mainline boot.img from GSI targets" into sc-dev am: e77729e02b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14965951

Change-Id: Idf95b292085c4eb05d9e3cc6cfa9f2c70d9c9ea7
2021-06-17 10:39:35 +00:00
TreeHugger Robot
e77729e02b Merge "Remove mainline boot.img from GSI targets" into sc-dev 2021-06-17 10:18:43 +00:00
Bill Peckham
184524a915 Fix typo in droidcore-unbundled.
Test: manual inspection.
Bug: 191304308
Change-Id: Ie63d08acff0b9accfafd906a43bd18cbef5471a3
2021-06-17 03:33:09 +00:00
TreeHugger Robot
6aacf83adf Merge "Add ro.vendor.build.dont_use_vabc to disable VABC OTA" into sc-dev am: 6e2acf1c60
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14970372

Change-Id: I758ee84f90e237eb4f4617b72a0345a6b06f06eb
2021-06-16 21:08:02 +00:00
TreeHugger Robot
6e2acf1c60 Merge "Add ro.vendor.build.dont_use_vabc to disable VABC OTA" into sc-dev 2021-06-16 20:48:16 +00:00
Bill Peckham
315b98a73a Introduce droidcore-unbundled target
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 0a30cc41bc)
2021-06-16 19:54:07 +00:00
SzuWei Lin
870752dfd2 Remove mainline boot.img from GSI targets
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 16:43:46 +08:00
Paul Scovanner
5e2beb9405 [automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: 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: I7bb3630f135796c7266d66c06831f94578a077aa
2021-06-15 06:44:11 +00:00
Paul Scovanner
6e77ba8a4b [automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: 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: I7eaee7f343ea97df5a182e64940a4ecca603a301
2021-06-15 06:44:06 +00:00
Paul Scovanner
acc10d23e1 [automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: 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 06:30:05 +00:00
Paul Scovanner
0c8423765d [automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: 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 06:29:39 +00:00
Paul Scovanner
c2c92bc5c3 [automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: 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 06:17:15 +00:00
Paul Scovanner
99c5b6455d [automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: 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 06:17:15 +00:00
Paul Scovanner
4c6a6534b5 [automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: 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-15 06:07:41 +00:00
Paul Scovanner
d4f2c30487 Update Security String to 2021-08-01 am: 719f8e6ff2 am: 731c612c5a am: 2b5cc45a3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096

Change-Id: I83c72777cf01ff01eb99c08f48efa1522fb147e5
2021-06-15 05:52:10 +00:00
Paul Scovanner
2b5cc45a3b Update Security String to 2021-08-01 am: 719f8e6ff2 am: 731c612c5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096

Change-Id: I43332aebc1ada9a38ea4896e3533d50c51b0871a
2021-06-15 05:39:05 +00:00
Paul Scovanner
731c612c5a Update Security String to 2021-08-01 am: 719f8e6ff2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096

Change-Id: Idbfb1d004c6dc78491713cdc5904463c3e4e33af
2021-06-15 05:26:37 +00:00
Jeff Sharkey
57df51ed4f [automerger skipped] Merge "[DO NOT MERGE] platform/build/make - S is now REL" into sc-dev am: 4ef2e34cb5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3f3d9b1ef00ad4bfb0893e8245eb4b652ce1d6e7
2021-06-15 03:55:54 +00:00
Jeff Sharkey
4ef2e34cb5 Merge "[DO NOT MERGE] platform/build/make - S is now REL" into sc-dev 2021-06-15 03:51:43 +00:00
Remi NGUYEN VAN
3163ad26d6 Merge "Use NetworkStack instead of NetworkStackNext" into sc-dev am: 4ba373fe0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14943952

Change-Id: I712293be85eddc61f518b6a10630474112a2f5af
2021-06-15 02:17:49 +00:00
Remi NGUYEN VAN
4ba373fe0f Merge "Use NetworkStack instead of NetworkStackNext" into sc-dev 2021-06-15 02:05:19 +00:00
Kelvin Zhang
9b55885314 Add ro.vendor.build.dont_use_vabc to disable VABC OTA
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-14 15:38:37 -07:00
Paul Scovanner
c1fa79e4cb Update Security String to 2021-08-05 am: f5139e3087 am: 7d9208ac9f am: 2585969307
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269

Change-Id: Iede3657382c7d454f9226670dd59663d972c390f
2021-06-14 22:03:09 +00:00
Paul Scovanner
f75c18f6ae Update Security String to 2021-08-05 am: f5139e3087 am: 7e1e5ad8ff am: 073480991e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269

Change-Id: I62a0fff8a6bdadc9716f638f19dbb6a610478e55
2021-06-14 22:03:04 +00:00
Baligh Uddin
fe16451181 Merge "Handles capex in signing script" into sc-dev am: 91b8435347
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14950211

Change-Id: Id3d207fbef209efd0f52b98b63da105c2d364f83
2021-06-14 22:02:53 +00:00
Paul Scovanner
2585969307 Update Security String to 2021-08-05 am: f5139e3087 am: 7d9208ac9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269

Change-Id: I48d91cf260c5b383baa9fde99c01d945977aea85
2021-06-14 22:02:03 +00:00
Paul Scovanner
073480991e Update Security String to 2021-08-05 am: f5139e3087 am: 7e1e5ad8ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269

Change-Id: Ifcfa2fd56abfd942b4af0a9a95e0150b95a0263f
2021-06-14 21:56:38 +00:00
Baligh Uddin
91b8435347 Merge "Handles capex in signing script" into sc-dev 2021-06-14 21:49:00 +00:00
Paul Scovanner
7d9208ac9f Update Security String to 2021-08-05 am: f5139e3087
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269

Change-Id: I5766ee11c2b1717f0aedd4895ce01108687c7d6c
2021-06-14 21:39:09 +00:00
Paul Scovanner
7e1e5ad8ff Update Security String to 2021-08-05 am: f5139e3087
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269

Change-Id: Icbeccbd10e0496e7a38720f165b0868954939a51
2021-06-14 21:39:09 +00:00
Paul Scovanner
719f8e6ff2 Update Security String to 2021-08-01
Bug: 191053489
Change-Id: I704c163481698332aea96919eea01209acedb133
Merged-In: Ieba9625ca0ccedf285209954f1e766b20455c32f
2021-06-14 19:11:26 +00:00
Paul Scovanner
f5139e3087 Update Security String to 2021-08-05
Bug: 191053489
Change-Id: Ieba9625ca0ccedf285209954f1e766b20455c32f
2021-06-14 18:53:26 +00:00
Remi NGUYEN VAN
45e403bd2e Use NetworkStack instead of NetworkStackNext
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-14 07:59:48 +00:00
Tianjie
579c347923 Handles capex in signing script
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 4d48d50036)
2021-06-12 18:13:59 +00:00