TreeHugger Robot
54cb463cce
Merge "Move GKI common settings to BoardConfigGkiCommon.mk" into sc-dev
2021-05-24 17:48:59 +00:00
TreeHugger Robot
8397a81680
Merge "Disable <uses-library> checks for more tests (to fix MTS builds)." into sc-dev
2021-05-24 17:28:30 +00:00
Ulya Trafimovich
da5c795604
Disable <uses-library> checks for more tests (to fix MTS builds).
...
Bug: 132357300
Bug: 188648210
Fixes: 188907662
Test: lunch aosp_cf_x86_64_phone-userdebug && m mts && m gts
Change-Id: Iae0ecac076b351b2da929bb455f00f03ece130bd
(cherry picked from commit d5e6a7c620
)
2021-05-24 06:23:47 -07:00
Michael Butler
e761c25b98
Merge "Revert "Add new llndk library, libneuralnetworks_shim.so"" into sc-dev
2021-05-21 17:57:00 +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
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 7780289064
)
2021-05-19 23:55:25 +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
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
235f1507e9
Merge "Revert^6 "Enforce <uses-library> check for Android.mk modules."" into sc-dev
2021-05-18 12:57:38 +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 640544bd96
)
2021-05-17 14:51:16 +08: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
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
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
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
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
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
c79de76e3e
Merge "Don't make dexpreopt_tools.zip when dex2oat isn't avilable" am: bf5d6238fe
am: e9b9f7f0f7
am: 9fda600aa3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1705507
Change-Id: If5d80fcf192bace7c400bec76e77d55e2ea92af9
2021-05-14 03:02:57 +00:00
Treehugger Robot
9fda600aa3
Merge "Don't make dexpreopt_tools.zip when dex2oat isn't avilable" am: bf5d6238fe
am: e9b9f7f0f7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1705507
Change-Id: Id7de61da766da6e0a6ee39e3ee54d0ca902de25f
2021-05-14 02:39:04 +00:00
Treehugger Robot
e9b9f7f0f7
Merge "Don't make dexpreopt_tools.zip when dex2oat isn't avilable" am: bf5d6238fe
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1705507
Change-Id: I35bbe366e804b38aafb37a85f41bc71d0afb17ee
2021-05-14 01:53:24 +00:00
Anthony Hugh
ad645285a6
Revert "Revert^2 "Enforce <uses-library> check for Android.mk modules.""
...
This reverts commit b6d1b48f9f
.
Reason for revert: This change is breaking seahawk-userdebug
BUG: 188108611
Change-Id: I15b737e2778d437ecbef6ab9f43345da407f2205
2021-05-14 01:52:06 +00:00
Treehugger Robot
bf5d6238fe
Merge "Don't make dexpreopt_tools.zip when dex2oat isn't avilable"
2021-05-14 01:21:41 +00:00
Hridya Valsaraju
329d896e52
Do not enforce debugfs restrictions on GSI builds
...
Devices that launched before Android S must still be able to access
debugfs.
Bug: 188022148
Test: build boot
Change-Id: I18ecec3f7daf5a1085de40606640ead63457c4b2
2021-05-13 17:28:27 -07:00
Jaewoong Jung
b34f64fc7a
Do not alter presigned prebuilt apks for SDK > 29.
...
Bug: 185811447
Test: Manual
Change-Id: I5ea143331e1bd1885dde4e46b086f4ce811f4981
2021-05-13 16:16:19 -07:00
Yifan Hong
289141549d
Merge "Rectify KMI version." am: c05ef17e31
am: 655e6a2c64
am: 51e07f62db
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1706146
Change-Id: If66a79a2dea904e509216bbd8ca80a73a95fa3c3
2021-05-13 20:31:34 +00:00
Yifan Hong
51e07f62db
Merge "Rectify KMI version." am: c05ef17e31
am: 655e6a2c64
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1706146
Change-Id: I4d9ae21bd63ebab39bb35942b9f31da94d1d5c96
2021-05-13 20:19:39 +00:00
Yifan Hong
655e6a2c64
Merge "Rectify KMI version." am: c05ef17e31
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1706146
Change-Id: I30dfa63c1fd5b095e4fc645f415cbce60782eab8
2021-05-13 19:53:06 +00:00
Yifan Hong
c05ef17e31
Merge "Rectify KMI version."
2021-05-13 19:32:10 +00:00
Ulyana Trafimovich
aeb62e4cbd
Merge "Revert^2 "Enforce <uses-library> check for Android.mk modules."" into sc-dev
2021-05-13 16:23:31 +00:00
Treehugger Robot
57f255301f
[automerger skipped] Merge "Revert^2 "Enforce <uses-library> check for Android.mk modules."" am: ae6bdc0c74
-s ours am: 4668e1d66f
-s ours am: c999886221
-s ours
...
am skip reason: Merged-In I21712e5197b3cb06e82e476f4c2f7277142034e9 with SHA-1 41a2ed7460
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1706689
Change-Id: Ia9f0ddd8407cc9fe03cda479b87ac855eedebdc8
2021-05-13 13:23:12 +00:00
Treehugger Robot
c999886221
[automerger skipped] Merge "Revert^2 "Enforce <uses-library> check for Android.mk modules."" am: ae6bdc0c74
-s ours am: 4668e1d66f
-s ours
...
am skip reason: Merged-In I21712e5197b3cb06e82e476f4c2f7277142034e9 with SHA-1 41a2ed7460
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1706689
Change-Id: I51700ffa74b14b1dd64394cb14e6035810a20a3d
2021-05-13 13:08:46 +00:00
Treehugger Robot
4668e1d66f
[automerger skipped] Merge "Revert^2 "Enforce <uses-library> check for Android.mk modules."" am: ae6bdc0c74
-s ours
...
am skip reason: Merged-In I21712e5197b3cb06e82e476f4c2f7277142034e9 with SHA-1 41a2ed7460
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1706689
Change-Id: I5f028cc625e004fa712273fbb2a12f2a7b74e8f6
2021-05-13 12:52:24 +00:00