Commit graph

61452 commits

Author SHA1 Message Date
Yifan Hong
76a337f65e Add odm_dlkm partition. am: f496f1b94f am: 4f2ea25d5f
Original change: https://android-review.googlesource.com/c/platform/build/+/1363859

Change-Id: I4aaa3967e889923f0958afaa3227474176e36ea9
2020-07-17 22:52:14 +00:00
Colin Cross
2de5588977 [automerger skipped] Merge "Install symbols for JNI libraries" into rvc-dev am: 89cf3cf572 -s ours
am skip reason: Change-Id If8e423c7cdf3afd518761b5ab6bc857321acda46 with SHA-1 e926cab372 is in history

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

Change-Id: I307f86e6fdb0a0d587f523c6d05356329b8c0685
2020-07-17 22:42:56 +00:00
Yifan Hong
4f2ea25d5f Add odm_dlkm partition. am: f496f1b94f
Original change: https://android-review.googlesource.com/c/platform/build/+/1363859

Change-Id: I8c7af808f72de5611cb52f34c0138bc97ceb6254
2020-07-17 22:27:15 +00:00
Colin Cross
89cf3cf572 Merge "Install symbols for JNI libraries" into rvc-dev 2020-07-17 22:16:01 +00:00
Colin Cross
116c0e8e44 [automerger skipped] Dist lint reports for apps am: 1db45ef2a2 -s ours
am skip reason: Change-Id Icd2b6f884396fa5f743746099301c325ca82a324 with SHA-1 b842952421 is in history

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

Change-Id: I6fedb71c2b9208890d2a15465e81921baf06d211
2020-07-17 20:53:44 +00:00
Colin Cross
8d2183f461 Install symbols for JNI libraries
When building an app in Soong with JNI libraries copy the unstripped
libraries to the symbols directory in directory that matches the
installed path of the APK.

Bug: 159726429
Test: forrest
Change-Id: If8e423c7cdf3afd518761b5ab6bc857321acda46
Merged-In: If8e423c7cdf3afd518761b5ab6bc857321acda46
(cherry picked from commit e926cab372)
2020-07-17 19:10:46 +00:00
Treehugger Robot
902286139d Merge "Adding vbmeta_system.img and vbmeta_vendor.img to droidcore" am: 9aa278a124 am: f80a0ad1a9
Original change: https://android-review.googlesource.com/c/platform/build/+/1364522

Change-Id: I47de417538cda11749dcf07e85c259a4f32104b3
2020-07-17 10:41:15 +00:00
Treehugger Robot
f80a0ad1a9 Merge "Adding vbmeta_system.img and vbmeta_vendor.img to droidcore" am: 9aa278a124
Original change: https://android-review.googlesource.com/c/platform/build/+/1364522

Change-Id: I493ef6e9dc3d7406257ef62b0a04ccb00944c551
2020-07-17 10:23:38 +00:00
Treehugger Robot
9aa278a124 Merge "Adding vbmeta_system.img and vbmeta_vendor.img to droidcore" 2020-07-17 10:07:05 +00:00
Bowgo Tsai
9b56140cb1 Adding vbmeta_system.img and vbmeta_vendor.img to droidcore
In the concept of system/vendor build split, usually vbmeta.img
won't be built in a system-only build and/or a vendor-only build.
Instead, vbmeta.img will be generated later when combining system
and vendor artifacts.

  - system-only artifacts: system.img, system_ext.img,
                           product.img and vbmeta_system.img
  - vendor-only artifacts: boot.img, vendor.img, odm.img and
                           vbmeta_vendor.img

PRODUCT_BUILD_VBMETA_IMAGE can be used to disable building vbmeta.img.
However, it also disables vbmeta_system.img and vbmeta_vendor.img
generation because both are only depended by vbmeta.img.

This change adds both vbmeta_[system|vendor].img into droidcore,
so they will be built even if PRODUCT_BUILD_VBMETA_IMAGE is set
to false, when we're building system-only artifacts or vendor-only
artifacts.

Bug: 161425613
Test: sets PRODUCT_BUILD_VBMETA_IMAGE := false then build, checks
      vbmeta_system.img is generated but vbmeta.img is not.
Change-Id: I39d9819da4704195b0e1ee58d13c848ae97d474a
2020-07-17 09:41:40 +00:00
Anton Hansson
0301836f47 Merge "Remove reference to empty variable" am: a0f05bedcc am: 5a949409ae
Original change: https://android-review.googlesource.com/c/platform/build/+/1363619

Change-Id: I7c5c773cf2eef091cbe710f6643aa654b138247f
2020-07-17 09:35:20 +00:00
Anton Hansson
5a949409ae Merge "Remove reference to empty variable" am: a0f05bedcc
Original change: https://android-review.googlesource.com/c/platform/build/+/1363619

Change-Id: I397eddce27e98fde835847c9748eec0332c9a42b
2020-07-17 09:19:25 +00:00
Anton Hansson
a0f05bedcc Merge "Remove reference to empty variable" 2020-07-17 08:51:28 +00:00
Treehugger Robot
57417ac6ed Merge "Rebuild buildinfo.prop after installclean" am: ac2050ff13 am: 9ef6e39738
Original change: https://android-review.googlesource.com/c/platform/build/+/1362376

Change-Id: I33b5b424e1e7a6c17705a4bc7d5269b03312397d
2020-07-17 06:24:39 +00:00
Treehugger Robot
9ef6e39738 Merge "Rebuild buildinfo.prop after installclean" am: ac2050ff13
Original change: https://android-review.googlesource.com/c/platform/build/+/1362376

Change-Id: If511f1de7befac3be2506defd6864f311ac251bf
2020-07-17 06:13:20 +00:00
Treehugger Robot
ac2050ff13 Merge "Rebuild buildinfo.prop after installclean" 2020-07-17 05:59:18 +00:00
Treehugger Robot
29e347e4be Merge changes Iacfe74ae,I7c380b60 am: ce13163827 am: 5771787ccb
Original change: https://android-review.googlesource.com/c/platform/build/+/1365306

Change-Id: I81debee224374fd8f60d1cad12a4e7ac6c0591ab
2020-07-17 04:59:48 +00:00
Treehugger Robot
5771787ccb Merge changes Iacfe74ae,I7c380b60 am: ce13163827
Original change: https://android-review.googlesource.com/c/platform/build/+/1365306

Change-Id: I2b2f24decfb8dd1e6b8d1960044f8f2c67e284c0
2020-07-17 04:39:06 +00:00
Treehugger Robot
ce13163827 Merge changes Iacfe74ae,I7c380b60
* changes:
  LOCAL_JNI_SHARED_LIBRARIES is no longer bad, so remove from my_soong_problems
  Add mk2bp_catalog.py that outputs more data about makefiles to be converted to soong.
2020-07-17 04:24:47 +00:00
Joe Onorato
8157070b37 LOCAL_JNI_SHARED_LIBRARIES is no longer bad, so remove from my_soong_problems
Test: m out/target/product/$(get_build_var TARGET_DEVICE)/mk2bp_remaining.html out/target/product/$(get_build_var TARGET_DEVICE)/soong_to_convert.txt
Change-Id: Iacfe74ae5a7f4f0607c8cac718e0487c30d20cae
2020-07-16 18:21:59 -07:00
Joe Onorato
02fb89a4d7 Add mk2bp_catalog.py that outputs more data about makefiles to be converted to soong.
- Adds makefile and which files are installed to the SOONG_CONV CSV file
- Updates soong_to_convert.py to be able to parse that
- Adds new script that is more detailed.
- Outputs that file as part of the droidcore build to
  $(OUT_DIR)/target/product/$(TARGET_DEVICE)/mk2bp_remaining.html

Test: m out/target/product/$(get_build_var TARGET_DEVICE)/mk2bp_remaining.html
Change-Id: I7c380b6070754f4329bf3965595751e4dac794a0
2020-07-16 18:19:15 -07:00
Colin Cross
1db45ef2a2 Dist lint reports for apps
Dist the transitive lint report for each unbundled app built by Soong
when lint-check is on the command line.

Bug: 153485543
Test: m TARGET_BUILD_APPS=Gallery2 lint-check dist
Change-Id: Icd2b6f884396fa5f743746099301c325ca82a324
Merged-In: Icd2b6f884396fa5f743746099301c325ca82a324
(cherry picked from commit b842952421)
2020-07-16 16:20:20 -07:00
Colin Cross
81e22595d4 Merge "Dist lint reports for apps" am: d56abedb02 am: ec7b0b85d9
Original change: https://android-review.googlesource.com/c/platform/build/+/1360938

Change-Id: I687efe1b63e316306dce9d3235470cb322e3ed20
2020-07-16 23:19:43 +00:00
Colin Cross
ec7b0b85d9 Merge "Dist lint reports for apps" am: d56abedb02
Original change: https://android-review.googlesource.com/c/platform/build/+/1360938

Change-Id: I8be53280c5969c00a3e03ac5ec555629a348dbbb
2020-07-16 23:19:32 +00:00
Treehugger Robot
477d9828c5 Merge "Install symbols for JNI libraries" am: 2738c3462d am: 1d20e2f7a9
Original change: https://android-review.googlesource.com/c/platform/build/+/1356186

Change-Id: I5770610d863cf4289c0235c357a628e0a3fbf7d5
2020-07-16 23:19:16 +00:00
Colin Cross
d56abedb02 Merge "Dist lint reports for apps" 2020-07-16 23:06:22 +00:00
Treehugger Robot
1d20e2f7a9 Merge "Install symbols for JNI libraries" am: 2738c3462d
Original change: https://android-review.googlesource.com/c/platform/build/+/1356186

Change-Id: I223ede62f29878d85f1c7bcd4399cc4e5200028e
2020-07-16 22:57:50 +00:00
Treehugger Robot
2738c3462d Merge "Install symbols for JNI libraries" 2020-07-16 22:43:53 +00:00
Yifan Hong
f496f1b94f Add odm_dlkm partition.
Test: define odm_dlkm in CF.
Bug: 156020364
Change-Id: I5593d09a1cdf13e651a13e951336555a7475865e
2020-07-16 12:34:29 -07:00
Anton Hansson
065676fbfb Remove reference to empty variable
Test: m
Change-Id: I1a79f1f468d937a9c1fd4fe9e0b5dd4f90f0d09d
2020-07-15 13:02:15 +01:00
Yo Chiang
204ba62996 Merge "Refine dump-files" am: 7c16b443c3 am: 3241e51595
Original change: https://android-review.googlesource.com/c/platform/build/+/1362417

Change-Id: If626546e8708a809b985e13b6721b61eb48468ea
2020-07-15 07:56:57 +00:00
Yo Chiang
3241e51595 Merge "Refine dump-files" am: 7c16b443c3
Original change: https://android-review.googlesource.com/c/platform/build/+/1362417

Change-Id: I80254a7e0d2e67bb462705dce8c667a8f6e21ec3
2020-07-15 07:41:39 +00:00
Yo Chiang
7c16b443c3 Merge "Refine dump-files" 2020-07-15 07:24:41 +00:00
Hung-ying Tyan
9ca864f88a Merge "Enable vbmeta_system for GSI targets" am: 6fa0dd9b94 am: 38267e1455
Original change: https://android-review.googlesource.com/c/platform/build/+/1359124

Change-Id: I85ad96c79f7d04c00a3aaee2fdbca7ddec709dad
2020-07-15 07:05:59 +00:00
Hung-ying Tyan
38267e1455 Merge "Enable vbmeta_system for GSI targets" am: 6fa0dd9b94
Original change: https://android-review.googlesource.com/c/platform/build/+/1359124

Change-Id: I1d4e89db0b408db8179c960eee3ba3c36920543e
2020-07-15 06:54:41 +00:00
Hung-ying Tyan
6fa0dd9b94 Merge "Enable vbmeta_system for GSI targets" 2020-07-15 06:34:34 +00:00
Tianjie Xu
25d2fb7a35 Merge "Use apksigner in check_target_files_signatures" am: 8542706908 am: e5eda8950f
Original change: https://android-review.googlesource.com/c/platform/build/+/1362881

Change-Id: I3c90e26190b8d07f1e57894f50b99a4919fa71fc
2020-07-15 03:57:33 +00:00
Tianjie Xu
e5eda8950f Merge "Use apksigner in check_target_files_signatures" am: 8542706908
Original change: https://android-review.googlesource.com/c/platform/build/+/1362881

Change-Id: I9c3eb3901165e0804f684b22b373b02b7022f9e2
2020-07-15 03:43:42 +00:00
Tianjie Xu
8542706908 Merge "Use apksigner in check_target_files_signatures" 2020-07-15 03:25:25 +00:00
Paul Scovanner
14bec32bb3 Update Security String to 2020-09-05 am: b751b77548
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12150174

Change-Id: I8d58f035d8f55ff8167c31c00a4b424930590837
2020-07-15 02:39:52 +00:00
Tianjie
a9a50cf6e3 Use apksigner in check_target_files_signatures
Some apk files, e.g. Chrome.apk has switched to use v2+ scheme.
And the apk file no longer has a META-INF/CERT.RSA. So, the
signature parsing script should use apksigner to dump the cert
info.

Leave the parsing of META-INF/CERT.RSA as a fallback, as some apks
fail the `apksigner verify`. The script also switches to store the
digest of the cert instead of the raw bytes.

Bug: 157735036
Test: run check_target_files_signatures on aosp|signed target-files

Change-Id: I910cd1aa91d1e446bef7097871af4171c285685d
2020-07-14 17:23:07 -07:00
Jiyong Park
c60c514e1a Rebuild buildinfo.prop after installclean
aosp/1317598 has made a regression that the dependency from
buildinfo.prop to INSTALLED_ANDROID_INFO_TXT_TARGET is removed. As a
result, buildinfo.prop is not re-builty even after installclean, which
caused inconsistency between  ro.build.display.id (from buildinfo.prop)
and ro.system.build.fingerprint (from build.prop which is re-built).

Fixing the issue by moving buildinfo.prop from $(call
intermediates-dir-for,ETC) to $(call intermediates-dir-for,PACKAGING)
so that it gets deleted by installclean.

Bug: 158583916
Test: m out/target/product/generic_arm64/system/build.prop
m installclean
m out/target/product/generic_arm64/system/build.prop
Inspect out/soong/verbose.gz and check that buildinfo.prop was newly
created.

Change-Id: Id82b8fdc872deffb6a1764ca6d3c7114301dee1d
2020-07-15 09:05:47 +09:00
Yifan Hong
b07289265f Merge changes from topic "vendor_dlkm" am: 6323e8b880 am: 7c6c8cc4c5
Original change: https://android-review.googlesource.com/c/platform/build/+/1351087

Change-Id: Ie5addc52830e1a1edd6ee2d135b709c35c2c13c7
2020-07-14 19:47:28 +00:00
Yifan Hong
c11bec7696 Install dlkm to appropriate place and symlink am: e51dff25ec am: 9a599be8df
Original change: https://android-review.googlesource.com/c/platform/build/+/1316439

Change-Id: I208c1fb5d1450442de4bbbe5d9134ec9033e3441
2020-07-14 19:47:24 +00:00
Yifan Hong
74034b6d64 Add notice files for vendor_dlkm am: 3d3f030c27 am: 271621a5d4
Original change: https://android-review.googlesource.com/c/platform/build/+/1312394

Change-Id: Ic676be5985440b82c9747fd6f725d6b026a2f15b
2020-07-14 19:47:21 +00:00
Yifan Hong
9fce02b625 Add vendor_dlkm partition. am: cfb917a1c7 am: 58af66905e
Original change: https://android-review.googlesource.com/c/platform/build/+/1316438

Change-Id: I84a4ffc60242ba92ade09dba87ba53a15394fe9f
2020-07-14 19:47:16 +00:00
Yifan Hong
7c6c8cc4c5 Merge changes from topic "vendor_dlkm" am: 6323e8b880
Original change: https://android-review.googlesource.com/c/platform/build/+/1351087

Change-Id: If2e8fb45ed158f0abb5873c31b815b92e68caecd
2020-07-14 19:29:10 +00:00
Yifan Hong
9a599be8df Install dlkm to appropriate place and symlink am: e51dff25ec
Original change: https://android-review.googlesource.com/c/platform/build/+/1316439

Change-Id: Ib3b05306dc2288a64cbf59e3bc366e7655c86186
2020-07-14 19:29:07 +00:00
Yifan Hong
271621a5d4 Add notice files for vendor_dlkm am: 3d3f030c27
Original change: https://android-review.googlesource.com/c/platform/build/+/1312394

Change-Id: I49a59ac1d90c1c5e9bb062f16e0e3b325c862361
2020-07-14 19:29:05 +00:00
Yifan Hong
58af66905e Add vendor_dlkm partition. am: cfb917a1c7
Original change: https://android-review.googlesource.com/c/platform/build/+/1316438

Change-Id: Iedf4f45d28bd060f6ab9fc980a8d9daadd055659
2020-07-14 19:29:02 +00:00