Commit Graph

25714 Commits

Author SHA1 Message Date
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
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
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
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
android-build-team Robot
117730e7e1 Make change and version bump to RP1A.200717.001
Change-Id: I5304e3443b3510d582a249060bbfb63b741c008f
2020-07-17 01:24:57 +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
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
android-build-team Robot
4a4f88efd1 Make change and version bump to RQ1A.200717.001
Change-Id: Ia57671087872925d60521c2bf6f51e9aaeaec580
2020-07-16 23:16:40 +00:00
Colin Cross
d56abedb02 Merge "Dist lint reports for apps" 2020-07-16 23:06:22 +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
android-build-team Robot
1401d543b7 Make change and version bump to RP1A.200716.001
Change-Id: I77ab5d6fc76b738996525d2fb8768e8c29872219
2020-07-16 01:17:40 +00:00
android-build-team Robot
3f66fc87f5 Make change and version bump to RQ1A.200716.001
Change-Id: I682ade39a7e0731e1e9afcad03ed28314b471e3c
2020-07-15 23:16:34 +00: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
7c16b443c3 Merge "Refine dump-files" 2020-07-15 07:24:41 +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
android-build-team Robot
73d36484d6 Make change and version bump to RP1A.200715.001
Change-Id: I3504f35b157a94993a50a67124eba45852e2b7c8
2020-07-15 01:15:52 +00: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
android-build-team Robot
76a7f21898 Make change and version bump to RQ1A.200715.001
Change-Id: I723f4d7243041d6aa85e6dfa4cf8f6cf8483f3b5
2020-07-14 23:17:08 +00: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
Paul Scovanner
b751b77548 Update Security String to 2020-09-05
Bug: 160158282
Change-Id: Ia207cf01e57df8539fbbbaf6e042bd610aa64956
2020-07-14 17:07:25 +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
android-build-team Robot
042144c22a Make change and version bump to RP1A.200714.001
Change-Id: Ie2f21a169ddd4886d5f9cf74d535f725657a4e57
2020-07-14 01:15:31 +00:00
android-build-team Robot
605eb4f06f Make change and version bump to RQ1A.200714.001
Change-Id: I4a82a0dc49b1e5836fc639113692980514b573ae
2020-07-13 23:16:12 +00:00
Colin Cross
5da1de831a Use unzip -DD
We put reproducible timestamps in zip files so that the artifacts
are consistent, but that leads to old timestamps in the output
directory if they are unzipped as part of the build.  Use
unzip -DD when unzipping to update the timestamps.

Bug: 161015009
Test: touch -d 2020-01-01 ref; find $OUT/system -not -newer ref
Change-Id: I6f08ba8695d90a8225cfc04e679755e6296deed0
Merged-In: I6f08ba8695d90a8225cfc04e679755e6296deed0
(cherry picked from commit c27d795b63)
2020-07-13 14:26:25 -07: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
Roland Levillain
5b64b25892 Merge "Turn COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into obsolete variables." am: 18a4837e07 am: eac977277e
Original change: https://android-review.googlesource.com/c/platform/build/+/1356640

Change-Id: I495754cce3a252e33ad893cbc733fade18484daf
2020-07-13 15:28:30 +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
31ebad0968 Merge "Use unzip -DD" am: 3227fc587c am: 7090c900e2
Original change: https://android-review.googlesource.com/c/platform/build/+/1360910

Change-Id: Ia28e7582b3e5ffa86ddd6674b843001763601512
2020-07-13 06:21:01 +00:00
android-build-team Robot
3c1fe16e7b Make change and version bump to RP1A.200713.001
Change-Id: I7dc5ee2bc7981b10cd3787ed040757416fcaf9b9
2020-07-12 23:15:58 +00:00
android-build-team Robot
28e59281d7 Make change and version bump to RQ1A.200713.001
Change-Id: I70dc9faa75ac6049ce42669b14660d21b8fee9ab
2020-07-12 21:15:18 +00:00
Colin Cross
c27d795b63 Use unzip -DD
We put reproducible timestamps in zip files so that the artifacts
are consistent, but that leads to old timestamps in the output
directory if they are unzipped as part of the build.  Use
unzip -DD when unzipping to update the timestamps.

Bug: 161015009
Test: touch -d 2020-01-01 ref; find $OUT/system -not -newer ref
Change-Id: I6f08ba8695d90a8225cfc04e679755e6296deed0
2020-07-12 05:38:03 +00:00