Commit Graph

70667 Commits

Author SHA1 Message Date
Michael Butler bbf26f35e4 Merge "Revert "Add new llndk library, libneuralnetworks_shim.so"" into sc-dev am: e761c25b98
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14631649

Change-Id: I47532d4807f2f095025310fb378816cd2277dd23
2021-05-21 18:26:04 +00:00
Michael Butler e761c25b98 Merge "Revert "Add new llndk library, libneuralnetworks_shim.so"" into sc-dev 2021-05-21 17:57:00 +00:00
android-build-team Robot f2038e6d3b Make change and version bump to SD2A.210521.001
Change-Id: I701770a3a5a08dc536ad7190b55ae5c629edfb6f
2021-05-21 01:20:23 +00:00
Christian Wailes 409ad701a9 Merge "Add dalvik.vm.dexopt.thermal-cutoff system property" into sc-dev am: 7ff708ad9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14604753

Change-Id: I10cd1ed2182d85960468316293bba63fbf7b46f7
2021-05-20 22:35:55 +00:00
Christian Wailes 7ff708ad9b Merge "Add dalvik.vm.dexopt.thermal-cutoff system property" into sc-dev 2021-05-20 22:26:34 +00:00
Kelvin Zhang 4bab20d246 Merge "Expose ota_metadata_proto for consumption" am: 51c8f9f34c am: 9dbff33bd9 am: 580a36f814 am: ee491d95eb am: 2067dff87c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14651850

Change-Id: Ia74acbf400e4b9ba35bc4590c82d2591f5768f4d
2021-05-20 20:23:37 +00:00
Hsin-Yi Chen 6968d4dc9c Add GKI to generic x86_64 board
- Remove emulator configurations from generic_x86_64/device.mk.
- Add GKI configurations to generic_x86_64/device.mk.

Test: lunch gsi_x86_64-userdebug ; make dist
Bug: 181277965
Change-Id: I43c8005afcaeec6ed70648b5f74eeed1d46f9228
Merged-In: I43c8005afcaeec6ed70648b5f74eeed1d46f9228
(cherry picked from commit b212b0a92abf8d00e83cff1975e580033a06db33)
2021-05-20 03:22:27 +00:00
android-build-team Robot ae789ffed5 Make change and version bump to SD2A.210520.001
Change-Id: If36d219f6d0b621fff792ea05b64c30c25442f73
2021-05-20 01:18:08 +00:00
Kelvin Zhang 2067dff87c Merge "Expose ota_metadata_proto for consumption" am: 51c8f9f34c am: 9dbff33bd9 am: 580a36f814 am: ee491d95eb
Original change: https://android-review.googlesource.com/c/platform/build/+/1708627

Bug: 186581246
Bug: 188575410

Change-Id: I996092bd29f8f6231c8055b44d59ae87d5809127
(cherry picked from commit 7780289064062d5529f88af0909fb6b02c521ac5)
2021-05-19 23:55:25 +00:00
Paul Scovanner e42f7aaccd Update Security String to 2021-07-05 am: 64b00db8f4 am: c10db361c0 am: 815c391ca3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14605426

Change-Id: I3964dd7f0259b3df733c325be3be97198aeabc3f
2021-05-19 23:01:41 +00:00
Paul Scovanner 45bb2415d8 Update Security String to 2021-07-05 am: 64b00db8f4 am: e580c75611 am: b8ae2c21e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14605426

Change-Id: I07f281ec840c4913aa89794c8cf2d88a9884d1bc
2021-05-19 23:01:36 +00:00
Paul Scovanner 815c391ca3 Update Security String to 2021-07-05 am: 64b00db8f4 am: c10db361c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14605426

Change-Id: I3ba73fd86ee4d3f8e12d9cac06f7a080fef35e07
2021-05-19 22:51:35 +00:00
Paul Scovanner b8ae2c21e1 Update Security String to 2021-07-05 am: 64b00db8f4 am: e580c75611
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14605426

Change-Id: Ie542698aef33599bf1e0d5315b58d2fcffada1d4
2021-05-19 22:42:09 +00:00
Paul Scovanner c10db361c0 Update Security String to 2021-07-05 am: 64b00db8f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14605426

Change-Id: I924d2ae0887e2c5d62ed165aaa1c581495cf2905
2021-05-19 22:26:57 +00:00
Paul Scovanner e580c75611 Update Security String to 2021-07-05 am: 64b00db8f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14605426

Change-Id: I89b530d9df421db3da5e3da15a38036255cda4bb
2021-05-19 22:25:31 +00:00
Chris Wailes a1c3d7aa35 Add dalvik.vm.dexopt.thermal-cutoff system property
Test: Boot
Bug: 165935246
Bug: 181795682
Change-Id: I45a8f8d6c7e99feccacd0bc8897f791571bdd9c9
2021-05-19 16:41:41 +00:00
SzuWei Lin dea57a49e2 Move GKI common settings to BoardConfigGkiCommon.mk
There are GKI arm64 and x86_64 now. The patch restructures the
GKI common settings to a new common BoardConfig file
"BoardConfigGkiCommon.mk".

It includes the ramdisk and boot image settings for GKI.
The patch also removes obsolete TARGET_PRELINK_MODULE.

Bug: 177859525
Bug: 181277965
Test: lunch gsi_arm64-userdebug ; make dist
Test: lunch gsi_x86_64-userdebug ; make dist
Change-Id: I204c8937d97140cc3c6ed3473d494f03f534ed75
Merged-In: I204c8937d97140cc3c6ed3473d494f03f534ed75
2021-05-19 09:00:16 +00:00
android-build-team Robot 54f1768d1e Make change and version bump to SD2A.210519.001
Change-Id: Ic2b311eece0649c26143297a27899d2a77846206
2021-05-19 01:18:02 +00:00
Michael Butler 4f436d3760 Revert "Add new llndk library, libneuralnetworks_shim.so"
This reverts commit 8685248a99.

Reason for revert: Removing libneuralnetworks_shim.so from Android S

Bug: 188587379
Test: mma
Change-Id: I3fa3092e02e9d1bbf00d801ad68ea754bfbd8c37
2021-05-18 18:05:03 -07:00
Ulyana Trafimovich 8cf10fe041 Merge "Revert^6 "Enforce <uses-library> check for Android.mk modules."" into sc-dev am: 235f1507e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14599590

Change-Id: I7f4610a3b07b5d77c7045e8b23816a2ee9a8bc40
2021-05-18 13:27:53 +00:00
Ulyana Trafimovich 235f1507e9 Merge "Revert^6 "Enforce <uses-library> check for Android.mk modules."" into sc-dev 2021-05-18 12:57:38 +00:00
Bowgo Tsai 44f1b6c68c BOARD_PREBUILT_BOOTIMAGE: removes the restriction of non system-as-root am: b9af035ee7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14551403

Change-Id: Idac0a317692522a4f523f4a5a25f3ea5730acb6b
2021-05-18 01:19:45 +00:00
Paul Scovanner 64b00db8f4 Update Security String to 2021-07-05
Bug: 188458861
Change-Id: Icdc728241b1bfe2428d1e6536a1a3b51f7a4a708
2021-05-17 21:54:30 +00:00
Ulyana Trafimovich d1d8c7133c Revert^6 "Enforce <uses-library> check for Android.mk modules."
This reverts commit 80e99d8851.

Reason for revert: relanding CL after fixing barbet-userdebug build.

Bug: 132357300
Change-Id: I4b8e22847215b349393f01f6c0a90dd03b6073cd
Test: on branch sc-dev: lunch barbet-userdebug && m
2021-05-17 09:36:52 +00:00
Bowgo Tsai b9af035ee7 BOARD_PREBUILT_BOOTIMAGE: removes the restriction of non system-as-root
Starting from Android 10, the system.img layout consists of
$TARGET_SYSTEM_OUT and $TARGET_ROOT_OUT, and is mounted by the
init as root. That is, system.img is always created as if
BOARD_BUILD_SYSTEM_ROOT_IMAGE was set.

  https://source.android.com/devices/bootloader/partitions/system-as-root

The previous concern is that there might be compatibility issues between
the ramdisk contained in boot.img with a newer system.img. But this is
no longer an issue after we always mount the system.img as root.

Bug: 187157581
Test: Tree Hugger
Change-Id: I4537e6ce6fb39b4b86caac82a13716abf515ffd6
Merged-In: I4537e6ce6fb39b4b86caac82a13716abf515ffd6
(cherry picked from commit 640544bd96946b5a512c59d42e3f3c24682697fe)
2021-05-17 14:51:16 +08:00
Treehugger Robot d880fab20e Merge "Reland: Enable verity computation on VABC devices" am: de1e64c7fd am: 8b02856f97 am: dc2fd4ea31 am: 460ce77c30
Original change: https://android-review.googlesource.com/c/platform/build/+/1708626

Change-Id: Id153595e06cb2fda431e2455f9deedaf139513c0
2021-05-14 21:59:10 +00:00
Treehugger Robot 460ce77c30 Merge "Reland: Enable verity computation on VABC devices" am: de1e64c7fd am: 8b02856f97 am: dc2fd4ea31
Original change: https://android-review.googlesource.com/c/platform/build/+/1708626

Change-Id: Ic6b4dd33e4930e33e84d1e6836580f11d131b5fa
2021-05-14 21:36:03 +00:00
Treehugger Robot dc2fd4ea31 Merge "Reland: Enable verity computation on VABC devices" am: de1e64c7fd am: 8b02856f97
Original change: https://android-review.googlesource.com/c/platform/build/+/1708626

Change-Id: Ic695676cd56ac3d8e68a79445af8f89e19bad83e
2021-05-14 21:17:48 +00:00
Treehugger Robot 8b02856f97 Merge "Reland: Enable verity computation on VABC devices" am: de1e64c7fd
Original change: https://android-review.googlesource.com/c/platform/build/+/1708626

Change-Id: I772e57ff6ed41569d2a6cfd6ac9bfdb9d109e792
2021-05-14 20:52:46 +00:00
Treehugger Robot de1e64c7fd Merge "Reland: Enable verity computation on VABC devices" 2021-05-14 20:38:18 +00:00
Ulyana Trafimovich 6f6ba6535d Merge "Revert^5 "Enforce <uses-library> check for Android.mk modules."" into sc-dev am: 6eac4c2236
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14551442

Change-Id: Ie6544a4e5ec12b146b8bc57a7f2e98166a566128
2021-05-14 17:53:00 +00:00
Ulyana Trafimovich 6eac4c2236 Merge "Revert^5 "Enforce <uses-library> check for Android.mk modules."" into sc-dev 2021-05-14 17:44:21 +00:00
Ulyana Trafimovich 80e99d8851 Revert^5 "Enforce <uses-library> check for Android.mk modules."
This reverts commit d6057adc0b.

Reason for revert: broken build git_master/barbet-userdebug @ 7362593

Change-Id: I5549aa949ccbead2c7fa3e933db50b6d74f5990e
2021-05-14 17:34:09 +00:00
Ulyana Trafimovich 0858cc2c86 Merge "Revert^4 "Enforce <uses-library> check for Android.mk modules."" into sc-dev am: 67fac6584e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14547722

Change-Id: Ia571ca3332922c57e89e17ca81caf3e8ce6decee
2021-05-14 16:44:39 +00:00
Kelvin Zhang 4de9bb23f2 Reland: Enable verity computation on VABC devices
Test: th
Test: Manual OTA test on bramble, pause/resume multiple times
Test: verity enabled, VABC enabled OTA
Test: verity enabled, VABC disabled OTA
Test: verity disabled, VABC enabled OTA
Test: verity disabled, VABC disabled OTA

Change-Id: Ia236984b158761f84f54ab7a6d3d49491c249546
2021-05-14 12:38:28 -04:00
Ulyana Trafimovich 67fac6584e Merge "Revert^4 "Enforce <uses-library> check for Android.mk modules."" into sc-dev 2021-05-14 16:28:55 +00:00
Ulyana Trafimovich d6057adc0b Revert^4 "Enforce <uses-library> check for Android.mk modules."
This reverts commit ad645285a6.

Reason for revert: relanding CL after fixing git_sc-car-dev builds and
  other build failures.

Bug: 132357300
Test: on branch sc-dev: lunch seahawk-userdebug && m
Test: on branch sc-dev: lunch osprey-userdebug && m
Test: on branch sc-dev: lunch factory_pipit-userdebug && m
Test: on sc-dev: lunch cf_x86_phone-userdebug && m droid dist tests
Test: forrest build partner-s-d1-fs-dev-slider/aosp_slider-userdebug:
  https://android-build.googleplex.com/builds/forrest/run/L22600000889121228
Change-Id: I74789903bd91d3bb45c69031fcbaf3556cb29408
2021-05-14 16:25:34 +00:00
Jaewoong Jung 0b0f8ecdc2 Merge "Do not alter presigned prebuilt apks for SDK > 29." am: 3218d79aa7 am: ff4544ceb4 am: b8781f9670 am: c3eb4ba8b1
Original change: https://android-review.googlesource.com/c/platform/build/+/1705710

Change-Id: I45ee105b9e503942343a916462a4918929164154
2021-05-14 16:14:08 +00:00
Jaewoong Jung c3eb4ba8b1 Merge "Do not alter presigned prebuilt apks for SDK > 29." am: 3218d79aa7 am: ff4544ceb4 am: b8781f9670
Original change: https://android-review.googlesource.com/c/platform/build/+/1705710

Change-Id: I303106c1dd2da73789e08be3b6170b09066a74c9
2021-05-14 15:58:08 +00:00
Jaewoong Jung b8781f9670 Merge "Do not alter presigned prebuilt apks for SDK > 29." am: 3218d79aa7 am: ff4544ceb4
Original change: https://android-review.googlesource.com/c/platform/build/+/1705710

Change-Id: I2ee3b84f4edf4af08821c8feece944cc84c62fb1
2021-05-14 15:18:26 +00:00
Jaewoong Jung ff4544ceb4 Merge "Do not alter presigned prebuilt apks for SDK > 29." am: 3218d79aa7
Original change: https://android-review.googlesource.com/c/platform/build/+/1705710

Change-Id: Ibb6585eca9474b783762343f0ab9f9302a7becb0
2021-05-14 14:31:22 +00:00
Jaewoong Jung 3218d79aa7 Merge "Do not alter presigned prebuilt apks for SDK > 29." 2021-05-14 14:07:17 +00:00
Treehugger Robot b84d3e9b16 Merge "Do not enforce debugfs restrictions on GSI builds" am: 04d72d0a46 am: 19b49a7b37 am: bb841af40d am: 46cff02f70
Original change: https://android-review.googlesource.com/c/platform/build/+/1707468

Change-Id: Icec1a2a4f280093eaffc67e7bf467481dd035797
2021-05-14 06:27:02 +00:00
Treehugger Robot 46cff02f70 Merge "Do not enforce debugfs restrictions on GSI builds" am: 04d72d0a46 am: 19b49a7b37 am: bb841af40d
Original change: https://android-review.googlesource.com/c/platform/build/+/1707468

Change-Id: I97f95e2f99e7b10c6852652b821eb59f76f05f8c
2021-05-14 06:12:44 +00:00
Treehugger Robot bb841af40d Merge "Do not enforce debugfs restrictions on GSI builds" am: 04d72d0a46 am: 19b49a7b37
Original change: https://android-review.googlesource.com/c/platform/build/+/1707468

Change-Id: I528dab15b694a3b214dda29ea654d30907660dcd
2021-05-14 05:55:29 +00:00
Treehugger Robot 19b49a7b37 Merge "Do not enforce debugfs restrictions on GSI builds" am: 04d72d0a46
Original change: https://android-review.googlesource.com/c/platform/build/+/1707468

Change-Id: Ifce0ca7ee8ad26e6febac8a1b96c2c4fa4d40357
2021-05-14 05:24:30 +00:00
Treehugger Robot 04d72d0a46 Merge "Do not enforce debugfs restrictions on GSI builds" 2021-05-14 05:05:20 +00:00
Anthony Hugh 2588484fa1 Merge "Revert "Revert^2 "Enforce <uses-library> check for Android.mk modules.""" into sc-dev am: b961222c08
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14540562

Change-Id: Ia28186d2c1c4e446c5d870aa416fa6e0c478a097
2021-05-14 05:03:12 +00:00
Anthony Hugh b961222c08 Merge "Revert "Revert^2 "Enforce <uses-library> check for Android.mk modules.""" into sc-dev 2021-05-14 04:40:15 +00:00
Treehugger Robot 868a4daa48 Merge "Don't make dexpreopt_tools.zip when dex2oat isn't avilable" am: bf5d6238fe am: e9b9f7f0f7 am: 9fda600aa3 am: c79de76e3e
Original change: https://android-review.googlesource.com/c/platform/build/+/1705507

Change-Id: Ie9cf79c68ac555f8d3e0e520474c1301578e8204
2021-05-14 03:26:35 +00:00