Commit graph

70758 commits

Author SHA1 Message Date
TreeHugger Robot
ae53a41a1f Merge changes Ie63d08ac,Ia7f8200c into sc-dev am: c66099dcc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15008279

Change-Id: I99e71fbfc149099a7e2bcdd9b71a7281960f5310
2021-06-17 15:18:21 +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
f2a4d4552f 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: I7549df1f57c7b4ba8cc8c833783c38846f584c6a
2021-06-17 10:38:47 +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
561e16a0a5 Merge "Show bazel help for b called without args." am: bb53fe394b am: 541174975b
Original change: https://android-review.googlesource.com/c/platform/build/+/1737501

Change-Id: I9a86255dd895e732ef7dd462a75b1e22c252de0d
2021-06-17 02:58:55 +00:00
Treehugger Robot
541174975b Merge "Show bazel help for b called without args." am: bb53fe394b
Original change: https://android-review.googlesource.com/c/platform/build/+/1737501

Change-Id: I973fe2c359649067c115c9af0ed1b1935e1807d0
2021-06-17 02:34:35 +00:00
Treehugger Robot
bb53fe394b Merge "Show bazel help for b called without args." 2021-06-17 02:19:07 +00:00
TreeHugger Robot
fbcfd102b1 [automerger skipped] Merge "Add ro.vendor.build.dont_use_vabc to disable VABC OTA" into sc-dev am: 6e2acf1c60 -s ours
am skip reason: Merged-In Iceb2fb1f399d38a51722352a86ddf68af05fa24e with SHA-1 10eac08fe1 is already in history

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

Change-Id: I390aac7c508bad3c92012c0f595d0ba6ea991c82
2021-06-16 21:06:47 +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
Hridya Valsaraju
b9d5aafce3 Merge "Disable build-time debugfs restrictions on GSI builds" am: 32bd512b9e am: 02e6d3ff74
Original change: https://android-review.googlesource.com/c/platform/build/+/1736064

Change-Id: I33ff6103a5c627844d8b9273791d0dd324b6887b
2021-06-16 18:14:31 +00:00
Hridya Valsaraju
02e6d3ff74 Merge "Disable build-time debugfs restrictions on GSI builds" am: 32bd512b9e
Original change: https://android-review.googlesource.com/c/platform/build/+/1736064

Change-Id: I47db6561d7a29b78ca4c9d254653f4131e32915a
2021-06-16 17:56:03 +00:00
Hridya Valsaraju
32bd512b9e Merge "Disable build-time debugfs restrictions on GSI builds" 2021-06-16 17:38:56 +00:00
Jingwen Chen
69f9ed14a9 Show bazel help for b called without args.
This is less surprising than trying to use --config=bp2build as the only args, which is invalid.

Test: source build/envsetup.sh; b
Change-Id: I0b3724d05b8cc149268e660eb672192fe9bad19d
2021-06-16 09:44:57 +00:00
Colin Cross
5e9ba92e05 Master is T
Bug: 186121492
Test: treehugger
Merged-In: Ie5ee4479ba98b9f4525b36e38493879a15661905
Change-Id: Ie5ee4479ba98b9f4525b36e38493879a15661905
2021-06-15 13:31:59 +00:00
Anton Hansson
e444a5c3fb Merge "Add help message for likely typo to lunch" am: 757e2e1fc1 am: 47bebaca8b
Original change: https://android-review.googlesource.com/c/platform/build/+/1736893

Change-Id: I526aa9d55b0bf4d6a10cc16b117e93fbb49896c8
2021-06-15 10:22:54 +00:00
Anton Hansson
47bebaca8b Merge "Add help message for likely typo to lunch" am: 757e2e1fc1
Original change: https://android-review.googlesource.com/c/platform/build/+/1736893

Change-Id: I3ed2ca1d5f2039f955db4f6d5a1401b4e7b307b8
2021-06-15 10:08:03 +00:00
Anton Hansson
757e2e1fc1 Merge "Add help message for likely typo to lunch" 2021-06-15 09:49:31 +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
1b219a5198 [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: Id30a858ee94c901b133df7498ab17149a6e1e16c
2021-06-15 06:43:23 +00:00
Paul Scovanner
4eda9953e4 [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: Ie5425814ef8c11a9c7f71f7371e54e86d5c4c820
2021-06-15 06:43:17 +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
e0860b67c0 Merge "[DO NOT MERGE] platform/build/make - S is now REL" into sc-dev am: 4ef2e34cb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14884214

Change-Id: I4a43aae47ff0f811efaf273d6528af13a2d3139e
2021-06-15 03:54:50 +00:00
Jeff Sharkey
3159f8f31b [DO NOT MERGE] platform/build/make - S is now REL am: 25d421446d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14884214

Change-Id: Ibe070a1f81c5e6456bc57a0d24df470e608e2de7
2021-06-15 03:54:47 +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
980167a5fc [automerger skipped] Merge "Use NetworkStack instead of NetworkStackNext" into sc-dev am: 4ba373fe0f -s ours
am skip reason: Merged-In Ia9f58c5986c717cb2882e2fc4daadb2b3874c6b5 with SHA-1 45efdc4e0e is already in history

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

Change-Id: I3a35b1a97ae64b2c7b1b2acdf7a205355b1fd71f
2021-06-15 02:16:32 +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
cc6c27e348 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: If5f33a3e9375117d443deb675f920840e4d3a2d4
2021-06-14 22:02:23 +00:00
Paul Scovanner
c57c536e09 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: I022dde955d07bc828b55474008fe5ff4f0362d71
2021-06-14 22:02:19 +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
Baligh Uddin
f3f2624ee4 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: Icafa38bca48b0421572bc038e76d34e623c25b2f
2021-06-14 22:01:52 +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
Hridya Valsaraju
2a2a97afba 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
2021-06-14 14:32:44 -07:00
Treehugger Robot
6b0f56a5fc Merge "Add ro.vendor.build.dont_use_vabc to disable VABC OTA" am: c09cda8c6c am: 61a1d6d7a3
Original change: https://android-review.googlesource.com/c/platform/build/+/1734412

Change-Id: I0cdfa2823cc075dce0fe75df2a36c1731ea15155
2021-06-14 19:13:17 +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
Treehugger Robot
61a1d6d7a3 Merge "Add ro.vendor.build.dont_use_vabc to disable VABC OTA" am: c09cda8c6c
Original change: https://android-review.googlesource.com/c/platform/build/+/1734412

Change-Id: I97143fdf5e4239085aa0e3581c79a640a1166745
2021-06-14 18:58:47 +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
Treehugger Robot
c09cda8c6c Merge "Add ro.vendor.build.dont_use_vabc to disable VABC OTA" 2021-06-14 18:37:29 +00:00