Commit Graph

70478 Commits

Author SHA1 Message Date
Jeongik Cha 2522c36b4c Target for tools to dexpreopt
Bug: 158843648
Test: m droidcore
Change-Id: I580e2b3285cc524234859998a0e4e072ecaef072
2021-05-12 23:28:49 +09:00
Ulya Trafimovich 0b154519b0 Enforce <uses-library> check for Android.mk modules.
Use "Merged-In" tag from CL ag/14063987 to prevent merging in the
rvc-qpr-dev-plus-aosp branch. That CL is unrelated to the current CL,
but related to <uses-library> checks in general.

Bug: 132357300
Test: treehugger
Change-Id: If31a9ed148e4f1195bf916a650d0afafef3d6915
Merged-In: I26f2887357193b0d4bb951fa5bb09384c149b381
(cherry picked from commit feeb6bcd1e)
2021-05-12 14:19:40 +00:00
Ulya Trafimovich feeb6bcd1e Enforce <uses-library> check for Android.mk modules.
Bug: 132357300
Test: treehugger
Change-Id: If31a9ed148e4f1195bf916a650d0afafef3d6915
2021-05-12 11:49:41 +01:00
Tianjie Xu 67030f79ec Merge "Calculate the runtime ro.build.id in ota scripts" am: fc15d50d6d am: f8ec92a3a9 am: 72e50e3669
Original change: https://android-review.googlesource.com/c/platform/build/+/1697318

Change-Id: I4e33860d86a17f8e35622dde654adb882bc9da32
2021-05-11 20:26:28 +00:00
Tianjie Xu 72e50e3669 Merge "Calculate the runtime ro.build.id in ota scripts" am: fc15d50d6d am: f8ec92a3a9
Original change: https://android-review.googlesource.com/c/platform/build/+/1697318

Change-Id: Ic9656b5829cdededa406a53c724e78dfdf9b392f
2021-05-11 20:02:36 +00:00
Tianjie Xu f8ec92a3a9 Merge "Calculate the runtime ro.build.id in ota scripts" am: fc15d50d6d
Original change: https://android-review.googlesource.com/c/platform/build/+/1697318

Change-Id: Ie70c4d39ef4f5a525b756a8bfdb6053c69a63fc3
2021-05-11 19:46:45 +00:00
Tianjie Xu fc15d50d6d Merge "Calculate the runtime ro.build.id in ota scripts" 2021-05-11 19:19:09 +00:00
Treehugger Robot 4ea660a62d Merge "Fix GKI 2.0 signing in the release process" am: 328a537e37 am: bde804c8cf am: daab4cb7c6
Original change: https://android-review.googlesource.com/c/platform/build/+/1699576

Change-Id: I939155566577ae36fd7626a080b2187919458222
2021-05-11 14:08:19 +00:00
Treehugger Robot 095b57327d Merge "sign_target_files_apks: replacing GKI signing args completely" am: dcadb68011 am: 6fd4524d0d am: 2c18f4b84b
Original change: https://android-review.googlesource.com/c/platform/build/+/1700885

Change-Id: Ief6b3f276eb8710a4089600f371b5bc87b1e1a78
2021-05-11 14:08:09 +00:00
Treehugger Robot daab4cb7c6 Merge "Fix GKI 2.0 signing in the release process" am: 328a537e37 am: bde804c8cf
Original change: https://android-review.googlesource.com/c/platform/build/+/1699576

Change-Id: Idbfa55cf5bfd780c1fda6b17869ba6a445361fda
2021-05-11 13:42:34 +00:00
Treehugger Robot 2c18f4b84b Merge "sign_target_files_apks: replacing GKI signing args completely" am: dcadb68011 am: 6fd4524d0d
Original change: https://android-review.googlesource.com/c/platform/build/+/1700885

Change-Id: Iec9bab5656bf4081be971066e9db57eaaa824433
2021-05-11 13:42:27 +00:00
Treehugger Robot bde804c8cf Merge "Fix GKI 2.0 signing in the release process" am: 328a537e37
Original change: https://android-review.googlesource.com/c/platform/build/+/1699576

Change-Id: Ia7394629a55cac686968e3d89a7e85442207ab8c
2021-05-11 13:27:10 +00:00
Treehugger Robot 328a537e37 Merge "Fix GKI 2.0 signing in the release process" 2021-05-11 13:05:15 +00:00
Bowgo Tsai 7bcb55b414 Fix GKI 2.0 signing in the release process
In the release signing process, it uses --signing_helper_with_files
for avbtool. This can be done by passing
--gki_signing_signature_args="--signing_helper_with_files=/path/to/helper.sh"
for mkbootimg.

However, this only works when there is a default value of
"gki_signing_signature_args" in the misc_info.txt, to be appended
with more extra args. Adding a default value "--prop foo:bar" to make
it work.

Note: also move the BOARD_GKI_* signing config to
BoardConfigGsiCommon.mk, so we don't have to duplicate the settings
for each architecture.

Bug: 178559811
Bug: 177862434
Test: `make bootimage`
      `unpack_bootimg --boot_img $OUT/boot.img --out unpack`
      `avbtool info_image --image ./unpack/boot_signature`
Change-Id: I8bd8ad3acf324931b47d45fd30bc590206b1927e
2021-05-11 18:10:18 +08:00
Treehugger Robot 6fd4524d0d Merge "sign_target_files_apks: replacing GKI signing args completely" am: dcadb68011
Original change: https://android-review.googlesource.com/c/platform/build/+/1700885

Change-Id: I259b543faccb0a37067f61d34c7573deac2a4980
2021-05-11 07:47:32 +00:00
Treehugger Robot dcadb68011 Merge "sign_target_files_apks: replacing GKI signing args completely" 2021-05-11 07:30:16 +00:00
Tim Van Patten ba4d55b905 Remove ro.gfx.angle.supported from base_system.mk
Remove ro.gfx.angle.supported from base_system.mk as a pre-requisite to
moving ANGLE to the CuttleFish-specific build. This fixes a merge
conflict that prevents the AOSP CL from landing.

Bug: 187342779
Test: make
Change-Id: I5c8b6ea71dbc066e125a072689778fe4dda1a686
2021-05-11 01:05:18 +00:00
Tianjie fdda51d2ae Calculate the runtime ro.build.id in ota scripts
If the build prop ro.build.id isn't set at build time, init will
set it at runtime. The logic is appending the vbmeta digest to
the ro.build.legacy.id.

Make the same change in ota scripts, so the correct build fingerprint
will be saved in the ota metadata.

Bug: 186786987
Test: generate an OTA, check the metadata
Change-Id: I278f59c41c1f98d4cbea749e5d9e4eaf7a6b9565
2021-05-10 11:35:48 -07:00
Bowgo Tsai bcae74def7 sign_target_files_apks: replacing GKI signing args completely
Commit I8bd8ad3acf324931b47d45fd30bc590206b1927e adds a default
value of "gki_signing_signature_args" in the misc_info.txt for
release signing to work. However, it's better to replace the default
value entirely (e.g., --prop foo:bar) as there is no need to include
them in the final release-signed image.

Bug: 178559811
Bug: 177862434
Test: atest releasetools_test
Test: atest releasetools_py3_test
Change-Id: I060b5a7076ff3e5d883abeb7d72f3db887c9fd69
2021-05-10 17:43:52 +08:00
Tianjie Xu 216c762826 Merge "Don't set the build id if we need to append the digest" am: a530481db1 am: 834dc90be1 am: 5678ae7b1c
Original change: https://android-review.googlesource.com/c/platform/build/+/1695406

Change-Id: I7a751270df9a6c02763c228f495c40c046c0115b
2021-05-09 00:10:02 +00:00
Tianjie Xu 5678ae7b1c Merge "Don't set the build id if we need to append the digest" am: a530481db1 am: 834dc90be1
Original change: https://android-review.googlesource.com/c/platform/build/+/1695406

Change-Id: I9b8b41c7890ecc8a6c32cc249b0db9fd72be3e7a
2021-05-08 23:30:17 +00:00
Tianjie Xu 834dc90be1 Merge "Don't set the build id if we need to append the digest" am: a530481db1
Original change: https://android-review.googlesource.com/c/platform/build/+/1695406

Change-Id: Ib5b71b351184bfc1cbbeb0c60e4a46f368c95b1c
2021-05-08 23:13:48 +00:00
Treehugger Robot d6b0c24605 Merge "Add ota_metadata_proto_java" am: e86abec252 am: e0c2b97fb1 am: 1f861b9347
Original change: https://android-review.googlesource.com/c/platform/build/+/1673907

Change-Id: I82fb88b8ac61801401ed3006f1cabb48a106e786
2021-05-08 23:08:19 +00:00
Treehugger Robot 64b549d813 [automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 62a73dbed0 am: 1a189eb467 -s ours am: e7a2e0f4fd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I221925ee25c67632c8c6df30ea23228d612e8235
2021-05-08 23:07:33 +00:00
Xin Li 93e09ab626 [automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: 7a2e4a990a am: d51c9221e4 -s ours am: 6da0b955b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I30e8f9d4a9a3cf6bdc926560cbe44e3b65821cb7
2021-05-08 23:07:27 +00:00
Tianjie Xu a530481db1 Merge "Don't set the build id if we need to append the digest" 2021-05-08 22:56:56 +00:00
Treehugger Robot 1f861b9347 Merge "Add ota_metadata_proto_java" am: e86abec252 am: e0c2b97fb1
Original change: https://android-review.googlesource.com/c/platform/build/+/1673907

Change-Id: Id89fe4a5b922a4fb8b47496e161726836ef5d52b
2021-05-08 22:46:04 +00:00
Treehugger Robot e7a2e0f4fd [automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 62a73dbed0 am: 1a189eb467 -s ours
am skip reason: Merged-In Ica626a3b19e5b642807234c288428cd7e0f40f98 with SHA-1 321db2f846 is already in history

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

Change-Id: I99fef0899f5e24b15d83192998e748a6bd3673fc
2021-05-08 22:45:15 +00:00
Xin Li 6da0b955b7 [automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: 7a2e4a990a am: d51c9221e4 -s ours
am skip reason: Merged-In Ica626a3b19e5b642807234c288428cd7e0f40f98 with SHA-1 321db2f846 is already in history

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

Change-Id: I9f54adab620e892a38dd56f6c7e21fc22ba53513
2021-05-08 22:45:13 +00:00
Treehugger Robot e0c2b97fb1 Merge "Add ota_metadata_proto_java" am: e86abec252
Original change: https://android-review.googlesource.com/c/platform/build/+/1673907

Change-Id: I1d5fe30e1412a5223f95ea2649e4f1b72f7cd7a5
2021-05-08 22:06:34 +00:00
Treehugger Robot 1a189eb467 Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 62a73dbed0
Original change: https://android-review.googlesource.com/c/platform/build/+/1700329

Change-Id: I9f1135f281bc018b4d59c0c9ff5e5e78934a4ab8
2021-05-08 22:01:11 +00:00
Xin Li d51c9221e4 DO NOT MERGE - Merge RQ2A.210505.003. am: 7a2e4a990a
Original change: https://android-review.googlesource.com/c/platform/build/+/1700329

Change-Id: Icd4a248b405c75f236a52025ad1ea2859b601c22
2021-05-08 22:00:38 +00:00
Treehugger Robot e86abec252 Merge "Add ota_metadata_proto_java" 2021-05-08 21:44:57 +00:00
Treehugger Robot 62a73dbed0 Merge "DO NOT MERGE - Merge RQ2A.210505.003." 2021-05-08 21:38:02 +00:00
Treehugger Robot 28e99c4932 Merge "Rename DexPreoptImageLocations to DexPreoptImageLocationsOnHost" am: 5a75afbede am: 593ab41f74 am: 9bafad0c19
Original change: https://android-review.googlesource.com/c/platform/build/+/1699567

Change-Id: Ia34ad43307ce10e08d025c1c21e33fc8099e3cdf
2021-05-08 02:45:56 +00:00
Treehugger Robot 9bafad0c19 Merge "Rename DexPreoptImageLocations to DexPreoptImageLocationsOnHost" am: 5a75afbede am: 593ab41f74
Original change: https://android-review.googlesource.com/c/platform/build/+/1699567

Change-Id: I7eae52cdbf184d1c86bf0d073b37c2f06756076d
2021-05-08 02:27:10 +00:00
Treehugger Robot 593ab41f74 Merge "Rename DexPreoptImageLocations to DexPreoptImageLocationsOnHost" am: 5a75afbede
Original change: https://android-review.googlesource.com/c/platform/build/+/1699567

Change-Id: I7b500416b448e43e7a720dbe623051192387aa13
2021-05-08 02:04:34 +00:00
Xin Li 7a2e4a990a DO NOT MERGE - Merge RQ2A.210505.003.
Bug: 187544653
Merged-In: Ica626a3b19e5b642807234c288428cd7e0f40f98
Change-Id: I3ff9da08d4c59e59a50bc89a6f962b185f8d3942
2021-05-07 18:51:09 -07:00
Treehugger Robot 5a75afbede Merge "Rename DexPreoptImageLocations to DexPreoptImageLocationsOnHost" 2021-05-08 01:47:39 +00:00
Yifan Hong 4ec807cb77 Merge "Fix the KMI version mismatch" am: 27ec5744f5 am: f23a5dc45d am: e7774805d5
Original change: https://android-review.googlesource.com/c/platform/build/+/1681973

Change-Id: Idbac1eb8831ffd3234c242cb826dc50504a0420e
2021-05-07 20:00:58 +00:00
Tianjie Xu a3da2066c1 Merge "Calculate the vbmeta digest when building images" am: efc00ca7b2 am: ac23c08dec am: 1091c8ddb0
Original change: https://android-review.googlesource.com/c/platform/build/+/1695405

Change-Id: I0fc52800f840b60e708cf3182c310ec71bcd9c25
2021-05-07 20:00:50 +00:00
Yifan Hong e7774805d5 Merge "Fix the KMI version mismatch" am: 27ec5744f5 am: f23a5dc45d
Original change: https://android-review.googlesource.com/c/platform/build/+/1681973

Change-Id: I6d04c68912fbc68bd61afbff5f047c0c685bee57
2021-05-07 19:44:25 +00:00
Tianjie Xu 1091c8ddb0 Merge "Calculate the vbmeta digest when building images" am: efc00ca7b2 am: ac23c08dec
Original change: https://android-review.googlesource.com/c/platform/build/+/1695405

Change-Id: I9336ef5adea1fd189d6468abc9a21ef4e4d260c6
2021-05-07 19:44:15 +00:00
Yifan Hong f23a5dc45d Merge "Fix the KMI version mismatch" am: 27ec5744f5
Original change: https://android-review.googlesource.com/c/platform/build/+/1681973

Change-Id: I7e0cddf993ed0934084d4298b5b9e60b7cdd53be
2021-05-07 19:27:18 +00:00
Tianjie Xu ac23c08dec Merge "Calculate the vbmeta digest when building images" am: efc00ca7b2
Original change: https://android-review.googlesource.com/c/platform/build/+/1695405

Change-Id: I38e070b6dfb79bf8ffbe32197b1f3a3c824c31f9
2021-05-07 19:26:45 +00:00
Yifan Hong 27ec5744f5 Merge "Fix the KMI version mismatch" 2021-05-07 19:18:15 +00:00
Tianjie Xu efc00ca7b2 Merge "Calculate the vbmeta digest when building images" 2021-05-07 19:06:32 +00:00
Jeongik Cha f17cca4813 Rename DexPreoptImageLocations to DexPreoptImageLocationsOnHost
The field is the path on the host side. Rename it to be more specific.

Bug: 158843648
Test: m
Change-Id: Ifa37c5f459440a30d508f37f9913f9e559ae6574
2021-05-07 20:29:29 +09:00
Inseob Kim 972de1ef9f Merge "Add BOARD_USES_ODMIMAGE to soong config" am: 6fa22ce3fa am: 1373c3ffac am: d39aca4357
Original change: https://android-review.googlesource.com/c/platform/build/+/1697491

Change-Id: I6200017a49162bccea9f1fd0c27c5f7bdfc83a3d
2021-05-07 01:03:02 +00:00
Inseob Kim d39aca4357 Merge "Add BOARD_USES_ODMIMAGE to soong config" am: 6fa22ce3fa am: 1373c3ffac
Original change: https://android-review.googlesource.com/c/platform/build/+/1697491

Change-Id: I757c7aa5dee1408e2bd8e3d57bc70e55fa8ca0da
2021-05-07 00:44:10 +00:00