Commit graph

59292 commits

Author SHA1 Message Date
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
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
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
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
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
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
81a092ff88 Add odm_dlkm/etc/build.prop
Test: build and manual test
Bug: 156020364
Change-Id: I0b22280362fec499af5ff063a5984ed17131d89d
2020-07-16 12:34:30 -07:00
Yifan Hong
3d5e2c210a Install ODM dlkm to appropriate place and symlink
Test: builds
Bug: 156020364
Change-Id: Ib0e44fe827397d0d1ec6d7edfceba1e9a43c76a3
2020-07-16 12:34:30 -07:00
Yifan Hong
c83f9e922b Add notice files for odm_dlkm
Test: pass
Bug: 156020364
Change-Id: Ia7e562cb96b9f14fa7ab0b74c253bf75fb699f0b
2020-07-16 12:34:30 -07:00
Yifan Hong
1e6d21787a Create $OUT/{vendor,odm}/lib before symlink modules
Before creating symlinks $OUT/{vendor,odm}/lib/modules, make sure
parent directory exists first.

Test: build CF
Bug: 156020364
Change-Id: Id2a9e5273aae75944c1b31553fad3703540bf2f4
2020-07-16 12:34:30 -07: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
Devin Moore
e46fd2d83d Add android.hardware.common and android.hardware.graphics.common
Added by calling update-vndk-list.sh

Test: Builds
Change-Id: I04f4ac48e9383faebed89a673dd4856d07dd5256
2020-07-15 15:46:17 -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
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
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
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
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
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
Yifan Hong
6323e8b880 Merge changes from topic "vendor_dlkm"
* changes:
  Add vendor_dlkm/etc/build.prop
  Install dlkm to appropriate place and symlink
  Add notice files for vendor_dlkm
  Add vendor_dlkm partition.
2020-07-14 19:15:12 +00:00
Hung-ying Tyan
1785816ca1 Enable vbmeta_system for GSI targets
in order to mix GSI onto android10 Cuttlefish.

Bug: 158302764
Test: mixing GSI onto android10 Cuttlefish
Change-Id: I77385495583034324f5e29bed27c588dc98215e2
2020-07-14 16:04:20 +00:00
Treehugger Robot
d2d1bf1972 Merge "Changes.md: Format section BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES" am: 5469096fbf
Original change: https://android-review.googlesource.com/c/platform/build/+/1362416

Change-Id: I600bb65504756fc23cf09485978034cdf66102a9
2020-07-14 11:22:27 +00:00
Treehugger Robot
5469096fbf Merge "Changes.md: Format section BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES" 2020-07-14 11:11:29 +00:00
Yo Chiang
561efbc1fb Refine dump-files
Dump $(modules_to_install) instead of $(product_target_FILES) to get a
more complete list of target files.

Use `echo $(modules_to_install) | tr -s ' ' '\n'` instead of
`$(foreach m,$(modules_to_install),$(info $(m)))`.
This way only one `echo` command is emitted instead of emitting `echo`
command for each file. This speeds up the invocation speed tremendously.

Bug: 159195410
Test: m dump-files
Change-Id: I06549cecc64177f1eb5a01e31a55d5eed307fcfd
2020-07-14 18:30:34 +08:00
Yo Chiang
3ca4980d36 Auto-generate dexpreopt boot image module
Add prebuilt modules that installs bootjar dexpreopt files generated by
soong, for example `dexpreopt_bootjar.boot_arm64` installs .art / .oat /
.vdex, etc for the framework boot image ("boot") for primary arch
("arm64").

Bug: 159196136
Test: TH built artifacts noop
Test: Check device boot images are installed
Test: ./prebuilts/build-tools/linux-x86/bin/ninja -f out/combined-aosp_arm64.ninja -t browse
Test: Check that generated dependency graph is sane
Test: Check that bootjar dexpreopt bits are listed in `m dump-files`
Change-Id: Ia30b37be9be972c5e28b5840923801ea7237a237
2020-07-14 15:49:08 +08:00
Yo Chiang
d4741817e3 Changes.md: Format section BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES
Quote Make variable names in backtick and add section anchor.

Test: preview in gittiles
Change-Id: Ia661090f42d2191ca6a52dd9168d270100c488ad
2020-07-14 15:15:08 +08:00
Yifan Hong
e51dff25ec Install dlkm to appropriate place and symlink
Test: builds
Bug: 156020364
Change-Id: I5958021ab54a2f99140796c3ef915b5329808ce3
2020-07-13 14:20:56 -07:00
Yifan Hong
3d3f030c27 Add notice files for vendor_dlkm
Test: pass
Bug: 156020364
Change-Id: I87e8b57a7a7f212071de4e530424740103a29434
2020-07-13 14:20:56 -07:00
Yifan Hong
cfb917a1c7 Add vendor_dlkm partition.
Test: define vendor_dlkm for CF.
Bug: 156020364

Change-Id: I459059e1c20df7a285a377b8b3bbc8decc60b124
2020-07-13 14:20:56 -07:00
Yifan Hong
51a971b1d5 Add vendor_dlkm/etc/build.prop
Test: builds and manual inspect
Bug: 156020364
Change-Id: Ic7606bc3cd8770ec56ddc7bea86c88625c38f32d
2020-07-13 14:20:56 -07:00
Patrice Arruda
4c90b694e8 Merge "Set ANDROID_ENABLE_METRICS_UPLOAD to the metrics_uploader path to upload metrics." am: 4a2e443ec2
Original change: https://android-review.googlesource.com/c/platform/build/+/1360984

Change-Id: I852698af98313059afc92cfeca1b8bcb5ecef91d
2020-07-13 18:09:16 +00:00
Patrice Arruda
4a2e443ec2 Merge "Set ANDROID_ENABLE_METRICS_UPLOAD to the metrics_uploader path to upload metrics." 2020-07-13 17:56:27 +00:00
Roland Levillain
eac977277e Merge "Turn COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into obsolete variables." am: 18a4837e07
Original change: https://android-review.googlesource.com/c/platform/build/+/1356640

Change-Id: Id412fc685fa6d93c7776d6ac51779ed7f16e1312
2020-07-13 14:46:05 +00:00
Roland Levillain
18a4837e07 Merge "Turn COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into obsolete variables." 2020-07-13 14:31:26 +00:00
Colin Cross
7090c900e2 Merge "Use unzip -DD" am: 3227fc587c
Original change: https://android-review.googlesource.com/c/platform/build/+/1360910

Change-Id: I99c61e3bf42df2453beab4c997cf24797837277d
2020-07-13 06:09:23 +00:00
Colin Cross
3227fc587c Merge "Use unzip -DD" 2020-07-13 05:58:28 +00:00