Commit graph

27230 commits

Author SHA1 Message Date
Bassem Khalife
16caffd2e7 Update Security String to 2022-03-05
Bug: 211820647
Change-Id: Ic0fb477acd4bd79c0ee464bf53b5d688f74e4863
2022-01-07 00:50:18 +00:00
Bassem Khalife
1babda1463 Update Security String to 2022-02-05
Bug: 210005927

Change-Id: I8b7a5dea105d34a7fa987ddb44e94d6f8c94c7cc
Merged-In: Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27
2021-12-16 22:55:27 +00:00
Nicolas Geoffray
df8b9c17b0 Merge "Use prebuilts of the ART Module by default in SC branches." into sc-v2-dev 2021-12-10 18:59:39 +00:00
Yi-yo Chiang
806d08f61d Merge changes from topic "no-more-boot-debug-gki-sc-v2-dev" into sc-v2-dev
* changes:
  Stop building boot-(debug|with-debug-ramdisk)-*.img for GSI/GKI
  Refactor build logic of boot-debug & vendor_boot-debug
  Skip building boot-(test-harness|debug).img if not needed
2021-12-10 05:36:27 +00:00
Yi-yo Chiang
a03f18f45d Merge "Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" into sc-v2-dev 2021-12-10 04:05:11 +00:00
Martin Stjernholm
bef0d6d710 Use prebuilts of the ART Module by default in SC branches.
This means prebuilts located in
/vendor/unbundled_google/modules/ArtGooglePrebuilt and
/prebuilts/module_sdk/art are used instead of sources in /art,
/libcore, and /libnativehelper.

Sanitizer and coverage builds builds are excluded, as are builds using
the products art_module_*, armv8, arm_krait, and others in
device/generic/art.

To keep using ART and libcore sources in local builds, set
SOONG_CONFIG_art_module_source_build=true. See art/build/README.md for
further info.

Cherry-picked from http://ag/15234812.

Merged-in set to https://r.android.com/1801147 to avoid merging into
master and *-plus-aosp branches, where we want to enable prebuilts
separately.

Test: build & boot on Cuttlefish
Bug: 200554575
Change-Id: Id6800fe3564149e6c555b5f68a41b01e9c7dff3f
Merged-In: I50187408a01e0c6f5ecea12fe3a423e1c5d93612
2021-11-29 18:08:52 +00:00
TreeHugger Robot
6cf39dbb91 Merge "Update Security String to 2022-01-05 Bug: 207022948" into sc-v2-dev 2021-11-24 23:28:38 +00:00
Yi-Yo Chiang
8d2495319b Refactor build logic of boot-debug & vendor_boot-debug
Add PRODUCT variables
  PRODUCT_BUILD_DEBUG_BOOT_IMAGE
  PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE
as toggles to enable/disable building boot-debug & vendor_boot-debug.

Bug: 200945738
Test: m bootimage_debug
Change-Id: Ic032b8594f776f911d7b6345a97d64fed930d890
Merged-In: Ic032b8594f776f911d7b6345a97d64fed930d890
(cherry picked from commit 4d7c613c58)
2021-11-24 07:53:32 +00:00
Bowgo Tsai
00fc943377 Skip building boot-(test-harness|debug).img if not needed
boot-(test-harness|debug).img is not needed for devices with
a /vendor_boot partition. They can use vendor_boot-(test-harness|debug).img
instead.

(Cherry-picked with Ic032b8594f776f911d7b6345a97d64fed930d890 to
solve merge conflict.)

Bug: 200945738
Bug: 196001476
Test: make then checks $OUT/*.img
Change-Id: If76df0329c96f718ebf0a0ac138cde3ae859a6c6
Merged-In: If76df0329c96f718ebf0a0ac138cde3ae859a6c6
(cherry picked from commit 4bb4d1fb91)
2021-11-24 07:53:20 +00:00
Yi-Yo Chiang
d395c6ff3f Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT
If this option is set, then an additional copy of the debug policy can
be installed to the GSI, and the init-second-stage of GSI could load
debug policy from GSI /system_ext when debug-ramdisk is used.

Bug: 188067818
Test: Flash RQ2A.201207.001 bramble-user with debug ramdisk & flash
  gsi_arm64-user from master, device can boot and `adb root` works
Change-Id: I9c3dad8bb6c5fa88b16762193446dc7e54f326c8
Merged-In: I9c3dad8bb6c5fa88b16762193446dc7e54f326c8
(cherry picked from commit 0a468fe904)
2021-11-24 14:34:26 +08:00
Bassem Khalife
ea4df1b901 Update Security String to 2022-01-05
Bug: 207022948

Change-Id: If34c71239a446a49d4521116a35b28418cfcd350
Merged-In: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981
2021-11-24 00:23:30 +00:00
Inseob Kim
d29e8b2db8 Add 31.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS
Bug: 189161483
Bug: 207344718
Test: m selinux_policy
Change-Id: I48b681fb28c78ea9dca922f5fb58f19a940c1a51
Merged-In: I48b681fb28c78ea9dca922f5fb58f19a940c1a51
(cherry picked from commit 94c27efb68)
2021-11-22 12:10:59 +00:00
Michael Wright
32d117dd52 S V2 is now REL
Bug: 204295952
Test: N/A
Change-Id: I5f94e458bf0c420341847a49242da20c9b4281e4
Merged-In: I5f94e458bf0c420341847a49242da20c9b4281e4
2021-11-15 23:39:36 +00:00
Michael Wright
5be855c250 Revert platform version to 12
Bug: 204295952
Test: N/A
Change-Id: I899af9326e95b4fcfb778f84b748f56834d54ca8
Merged-In: I7f87d189030e97f47dc81b756d1397b4aa65daf0
2021-11-15 23:39:26 +00:00
Treehugger Robot
202b4413a0 Merge "Allow compatibility suite also build a test list" am: 7fe5450be2 am: 30e367dbb4 am: 4d15c8b486 am: 3dd45cab17
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16133595

Change-Id: Icd61658877da9c005172cfbafe320b91cdaf0985
2021-11-10 07:38:13 +00:00
Michael Wright
24d3b88704 S V2 is now 32
Bug: 204295952
Test: N/A
Change-Id: I0627247e0b40c6c912584d55417671d20167b7c2
Merged-In: I0627247e0b40c6c912584d55417671d20167b7c2
2021-11-05 19:39:39 +00:00
Cheonho Park
51fb042cc2 Use findstring to check MODULE_BUILD_FROM_SOURCE
Android 12 can have _compressed target
(e.g com.google.android.conscrypt_compressed),
changed function from `filter` to `findstring`

Same change applied to com.google.android.art check

Also modify to check `true` value of the MODULE_BUILD_FROM_SOURCE
to filter out both unset variable and `false`

Test: adding one error code temporally, install prebuilt
  train, and check result with,without this fix

    MODULE_BUILD_FROM_SOURCE := true
  + $(error we are here, true $(PRODUCT_PACKAGES))
  endif

Bug: 197282276
Change-Id: I864ba1bb5da61ccc6b8576029ab6c569959b2c93
(cherry picked from commit 32c048c379)
2021-10-30 03:24:33 +00:00
Treehugger Robot
3dd45cab17 Merge "Allow compatibility suite also build a test list" am: 7fe5450be2 am: 30e367dbb4 am: 4d15c8b486
Original change: https://android-review.googlesource.com/c/platform/build/+/1844555

Bug: 201591516
Change-Id: Id124e6eb6d5c8c0ec31aca6b5878577519125c30
(cherry picked from commit 10218c724d)
2021-10-29 21:43:12 +00:00
Paul Scovanner
16eff988ab [DO NOT MERGE]
Update SPL to 2021-12-05

Bug: 202436544
Change-Id: Ib03873315839e4858f93d1ebbbc17054d46246c9
Merged-In: Ic0dabce4beb09bdd966152c059730677ca5bf5aa
2021-10-11 22:57:45 +00:00
Paul Scovanner
9cba3016fe Update SPL to 2021-12-05
Bug: 202436544
Change-Id: Ic0dabce4beb09bdd966152c059730677ca5bf5aa
Merged-In: Ie4645b81d47aa677c4237bda8303d6c2e502844f
2021-10-11 20:46:15 +00:00
Colin Cross
2b595c26d1 Merge "Update build_id.mk and version_defaults.mk for SC QPR1" into sc-qpr1-dev 2021-09-29 16:59:52 +00:00
Colin Cross
177cbf600d Update build_id.mk and version_defaults.mk for SC QPR1
Set BUILD_ID to "SC_QPR1", and update DEFAULT_PLATFORM_VERSION to
"SQ1A".

Bug: 201081191
Test: m checkbuild
Change-Id: I1ed59bef262be000bb8c77ed83bb549164a1c39b
Merged-In: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4
Merged-In: Ie8bed4cefed83db5324ad98b6e70cb69b3f82780
2021-09-24 10:34:43 -07:00
Colin Cross
6487d1dfd7 Update build_id.mk and version_defaults.mk for SC V2
Set BUILD_ID to "SC_V2".

Bug: 201082421
Test: m checkbuild
Merged-In: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4
Change-Id: Ie8bed4cefed83db5324ad98b6e70cb69b3f82780
2021-09-24 10:33:07 -07:00
Paul Scovanner
1509179e5b [DO NOT MERGE]
Update Security String to 2021-11-05

Bug: 199784479
Change-Id: Ifa8ff73fae3900b2942a30f225272b7a0a4bd289
Merged-In: Ifa8ff73fae3900b2942a30f225272b7a0a4bd289
2021-09-17 21:52:39 +00:00
Paul Scovanner
0449bb97fa [DO NOT MERGE]
Update Security String to 2021-11-05

Bug: 199784479
Change-Id: I7e03900c5d853b32f8fbd75cb591063ba4a27450
Merged-In: I7e03900c5d853b32f8fbd75cb591063ba4a27450
2021-09-16 11:39:07 +00:00
Colin Cross
ef1bcc1f9a Revert "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC""
This reverts commit bf70d0ba2a.

Reason for revert: camera prebuilt fixed to support short BUILD_ID

Bug: 196178071
Change-Id: Idcb57daf31907f1dff615e180790a2f52462b430
Merged-In: I3b7166d28df6d8828f895f839186de78592d259e
2021-09-13 23:44:53 +00:00
Joe Onorato
b04f414eed Revert "Change function to check MODULE_BUILD_FROM_SOURCE" am: f3055ad6a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15783351

Change-Id: I3e9f50c298a3322fad5f4711539a5656237e3b8e
2021-09-08 09:05:34 +00:00
Cheonho Park
4b609dfc6d Change function to check MODULE_BUILD_FROM_SOURCE am: 32c048c379
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15692182

Change-Id: I502fb1eea220e579008229876be8426bd9b5b86b
2021-09-08 05:34:19 +00:00
Joe Onorato
f3055ad6a6 Revert "Change function to check MODULE_BUILD_FROM_SOURCE"
This reverts commit 32c048c379.

Reason for revert: Dr. No approved prematurely

Bug: 197282276
Change-Id: I2f7919be20d312227f575a0313a33e7eba11ddff
2021-09-08 05:32:14 +00:00
Cheonho Park
32c048c379 Change function to check MODULE_BUILD_FROM_SOURCE
com.google.android.conscrypt is not valid for this
usage as S-OS can have a compressed target by default
(e.g com.google.android.conscrypt_compressed)

Same change applied to com.google.android.art check

Also modify to check `true` value of the MODULE_BUILD_FROM_SOURCE
to filter out both unset variable and `false`

Test: adding one error code temporally, install prebuilt
  train, and check result with,without this fix

    MODULE_BUILD_FROM_SOURCE := true
  + $(error we are here, true $(PRODUCT_PACKAGES))
  endif

Bug: 197282276
Change-Id: I864ba1bb5da61ccc6b8576029ab6c569959b2c93
2021-08-31 02:05:10 +00:00
Presubmit Automerger Backend
f0e17b7b9e [automerge] Revert "Update Security String to 2021-10-06" 2p: 1f04c4d3e7 am: bbb758b783
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15678276

Change-Id: I6719b3a57e58152bfbbb05d04384448f106f5516
2021-08-26 01:18:33 +00:00
Paul Scovanner
1f04c4d3e7 Revert "Update Security String to 2021-10-06"
This reverts commit 61275cd338.

Reason for revert: SPL bump no longer necessary due to ATT FRC respin

Bug: 193547118
Change-Id: I1df0e12d50471b518653ff865637193bd7ed9101
2021-08-26 01:04:17 +00:00
Paul Scovanner
8125e52dd7 [automerge] Update Security String to 2021-10-06 2p: 61275cd338 am: 5f9af61fc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15676633

Change-Id: Icc115e93811d7ab1e24ae4151c3f74945435073b
2021-08-26 00:06:40 +00:00
Paul Scovanner
61275cd338 Update Security String to 2021-10-06
Bug: 193547118
Change-Id: I6bbbf0d627c2e978beb28c2fc4ebac142ca63c1e
2021-08-25 20:24:40 +00:00
Paul Scovanner
6480bac205 Update Security String to 2021-10-05 am: 91cbb67645 am: 4d57439ca8
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15559362

Change-Id: I40349f5ed8acd7d7293c3d041c58d81b6f2b4371
2021-08-13 23:25:07 +00:00
Paul Scovanner
91cbb67645 Update Security String to 2021-10-05
Bug: 193547118
Change-Id: I4a0cd58b18214b77302ae7ed81c189f4549dc41d
2021-08-13 19:50:02 +00:00
Anton Hansson
f045b10d7d Merge "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"" into sc-dev 2021-08-12 14:20:58 +00:00
Anton Hansson
bf70d0ba2a Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"
This reverts commit 52f0172772.

Reason for revert: broke bramble boot test

Bug: 196357202
Change-Id: Ib6f05cd323109076cbc6693d16a74cd1d86a6849
2021-08-12 14:19:54 +00:00
Sanket Chinchalkar
7c600bb59f Merge "Report Performance Test Metrics as JSON File" into sc-dev am: d1bfb2e9ed am: 228204d820
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15502939

Change-Id: Id85e50300bb3f9af14ffb7ef2880c15a81fc0787
2021-08-12 01:56:31 +00:00
Sanket Chinchalkar
d1bfb2e9ed Merge "Report Performance Test Metrics as JSON File" into sc-dev 2021-08-12 01:17:34 +00:00
Matthew Mintz
52f0172772 RESTRICT AUTOMERGE Set BUILD_ID=SC
Bug: 196178071
Bug: 196043450
Bug: 171506470
Test: adb shell getprop ro.build.fingerprint
Change-Id: I80596f736ce5421530ccaaa035075ceb801a6fe2
2021-08-11 15:09:44 +00:00
Kun Niu
bc9354bb3c Merge "Remove MODULE_BUILD_FROM_SOURCE=true for coverage builds" into sc-dev am: bf90be8a65 am: 7424feabb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15502941

Change-Id: I89f8b419b33433bdb92d2d6c1b645be14854f45a
2021-08-11 07:27:01 +00:00
Kun Niu
bf90be8a65 Merge "Remove MODULE_BUILD_FROM_SOURCE=true for coverage builds" into sc-dev 2021-08-11 07:02:18 +00:00
TreeHugger Robot
00cca5b11a Merge "Adding vendor_boot-test-harness.img" into sc-dev am: e135511f4d am: dbab3c817a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15454001

Change-Id: I8891866bb8931ef53024a06735edd1eca1a62e07
2021-08-10 02:31:37 +00:00
TreeHugger Robot
e135511f4d Merge "Adding vendor_boot-test-harness.img" into sc-dev 2021-08-10 01:54:56 +00:00
Spandan Das
170898b9e0 Remove MODULE_BUILD_FROM_SOURCE=true for coverage builds
(This is a cherrypick of aosp/1788549)

This flag will be selectively added to build targets if necessary

Bug: 193569756
Test: m nothing
Merged-In: Ie0fd898b03aa91322dddd9137b038031d46c8d24
Change-Id: Ie0fd898b03aa91322dddd9137b038031d46c8d24
2021-08-09 18:22:54 +00:00
Sanket Chinchalkar
ef0a516cc5 Report Performance Test Metrics as JSON File
Test: Tested Locally
Bug: 193722630
Change-Id: I113198050e4b0c5242785bc4bbee5fa95c19114d
2021-08-09 09:55:04 -07:00
Colin Cross
b713d8aa9f Merge "Remove S codename from sc-v2-dev" into sc-v2-dev 2021-08-06 18:36:10 +00:00
Colin Cross
b3c7b25df4 Remove S codename from sc-v2-dev
S was finalized, it shouldn't be listed as an active codename any
more.

Bug: 193674948
Test: treehugger
Change-Id: I4cce94b0ea4865a5248ab106edce8fa165390005
Merged-In: Ie5ee4479ba98b9f4525b36e38493879a15661905
2021-08-04 16:55:50 -07:00
Colin Cross
c837710b52 Merge "Update codename for sc-v2-dev to Sv2" into sc-v2-dev 2021-08-04 23:29:31 +00:00