Commit Graph

26184 Commits

Author SHA1 Message Date
Treehugger Robot
50c0f97fe7 Merge "Finds APK shared UID violations when merging target files." 2020-11-04 21:44:40 +00:00
Bill Yi
52e7a7ca34 Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE
Merged-In: I6fac0ea9a1815b005e0735844b7100043099a975
Change-Id: I8f4d4dbb5d51af80eb633078d1c677bad440c7ee
2020-11-03 22:49:02 -08:00
android-build-team Robot
3175c17130 Version bump to RQ1A.201205.009 [core/build_id.mk]
Change-Id: Ie13afe8c6cd67eeb769b7292d13c12e7ded2a2ba
2020-11-04 04:05:06 +00:00
android-build-team Robot
42eddc5383 Make change and version bump to RQ2A.201104.001
Change-Id: I875dd90a5dd597f96ac2567b454a557cd2b3bb08
2020-11-04 00:17:54 +00:00
Artur Satayev
a97b43e4bd Revert^2 "Add a check for apex/allowed_deps.txt to droidcore."
67e8be4b9c

Test: presubmit
Change-Id: I5695dd1003386191dbbe0ea511ef5b615d0d5e4e
Merged-In: I5695dd1003386191dbbe0ea511ef5b615d0d5e4e
(cherry picked from commit 0efeca6a25)
2020-11-03 17:49:30 +00:00
Ulya Trafimovich
1bca532106 Rework class loader context implementation.
In Soong, the old flat representation is changed to a map of trees
(keyed on SDK versions). In Make, the new representation is not as
advanced as in Soong -- it is a map of flat lists rather than trees.
It works for now, because there is only one app that has a non-& class
loader context, and it is simple enough to use flat lists.

Test: lunch aosp_cf_x86_phone-userdebug && m
Bug: 132357300
Bug: 168686456
Change-Id: If1080295a2fafa6772383ee9fbffd7c458462c18
2020-11-03 11:23:42 +00:00
android-build-team Robot
3d5a76f615 Make change and version bump to RQ2A.201103.001
Change-Id: I8e4f596d9bc2169cdf936b7f6845843226601e8b
2020-11-03 00:17:40 +00:00
android-build-team Robot
8cfa595ed1 Make change and version bump to RQ2A.201102.001
Change-Id: Icab18974adbea1ec36116460b12e52e39ef590e7
2020-11-01 22:16:28 +00:00
android-build-team Robot
36709b4b63 Make change and version bump to RQ2A.201101.001
Change-Id: Iaa741426ebcd9957a6acb8361f01c083c229a63d
2020-10-31 21:16:23 +00:00
Yo Chiang
336883a64f Add phony target to check all PCF ELF prebuilts
Add phony target check-elf-prebuilt-product-copy-files that asserts
PRODUCT_COPY_FILES doesn't have ELF prebuilts.
This helps triage PCF ELF errors by providing a convenient target to
check / list all errors.

Bug: 140560012
Bug: 156534160
Test: lunch aosp_cf_x86_phone
Test: m USE_NDK_TRANSLATION_BINARY=true \
  check-elf-prebuilt-product-copy-files -k
Change-Id: Ic7fa43c10b0c30b3b1d9b7c2fae75cc6ea4a3513
2020-10-31 06:46:31 +00:00
android-build-team Robot
3f95724bcb Version bump to RQ1A.201205.008 [core/build_id.mk]
Change-Id: I6c6daca45f2fde2eb8fcb7718dc98df23e3ee793
2020-10-31 00:26:00 +00:00
android-build-team Robot
0c72559b68 Make change and version bump to RQ2A.201031.001
Change-Id: I2e6105a0ad36fa49a812f36dd092ce329d4bcd8d
2020-10-30 23:16:46 +00:00
android-build-team Robot
e8dfa89269 Version bump to RQ2A.201030.002 [core/build_id.mk]
Change-Id: I026f2c1cffa95f823d1129d23e39296bbc8dbd66
2020-10-30 19:03:48 +00:00
Yifan Hong
f5b6603c57 Merge changes I7bd61f74,Ia84e604a,I75e13b92,I0db2af20,I4feac435 am: d2ae9989cd am: e5b97b4714
Original change: https://android-review.googlesource.com/c/platform/build/+/1478502

Change-Id: Ib989f22b0b86a386818c94d4d1ec39e3af88d7d0
2020-10-30 17:40:28 +00:00
Yifan Hong
d2ae9989cd Merge changes I7bd61f74,Ia84e604a,I75e13b92,I0db2af20,I4feac435
* changes:
  Mount generic ramdisk as readwrite.
  Do not put GENERIC_KERNEL_CMDLINE in recovery image.
  Move common code out of the conditional.
  Remove device-specific bits if recovery_as_boot
  Do not assume GKI just with vendor_boot.
2020-10-30 16:52:28 +00:00
Paul Duffin
8bf8a1c55a Merge "Move boot jars package check to Soong" am: 58d6758ea1 am: 69fb86458c
Original change: https://android-review.googlesource.com/c/platform/build/+/1478737

Change-Id: Ic670e66bdb512e709c433a2e75ff9b1ff06616ad
2020-10-30 11:14:53 +00:00
Paul Duffin
58d6758ea1 Merge "Move boot jars package check to Soong" 2020-10-30 10:06:46 +00:00
Alistair Delva
f1d308264c Merge "Allow flashing erofs system imgs" am: 38d49ca61a am: b3d45c1db1
Original change: https://android-review.googlesource.com/c/platform/build/+/1353441

Change-Id: Ib231a6e90b32f18c39b7cde8766cc20cdeff8be2
2020-10-30 07:35:13 +00:00
Alistair Delva
38d49ca61a Merge "Allow flashing erofs system imgs" 2020-10-30 06:41:25 +00:00
android-build-team Robot
22c21c1d7d Version bump to RQ1A.201205.007 [core/build_id.mk]
Change-Id: I1e30f275e0165ababa3db85859f3e1c8700d689e
2020-10-30 01:46:56 +00:00
android-build-team Robot
2cbb7a851c Make change and version bump to RQ2A.201030.001
Change-Id: I8a4f4106ff0002224c37c073cc48aed38ce22746
2020-10-29 23:17:17 +00:00
Daniel Norman
b8d52a2fdc Finds APK shared UID violations when merging target files.
This involved moving the find-shareduid-violation.py script to
releasetools to simplify the cross-tool usage. This new location aligns
this script with other similar python host tools.

In a future change this violation file will be used to check for
shared UID violations across the input build partition boundary.

Bug: 171431774
Test: test_merge_target_files
Test: Use merge_target_files.py to merge two partial builds,
      observe shared UID violations file contents in the result.
Test: m dist out/dist/shareduid_violation_modules.json
      (Checking that existing behavior in core/tasks is presereved)
Change-Id: I7deecbe019379c71bfdbedce56edac55e7b27b41
2020-10-29 09:33:26 -07:00
Joseph Murphy
4586a367b2 Merge "Changes Robolectric test suite tag to its own value to enable filtering these in ATP." am: 67e1341100 am: 51a8b2b3bd
Original change: https://android-review.googlesource.com/c/platform/build/+/1477422

Change-Id: Ie6f51afb072c6baa8c8116d02e0ec43998a64cb5
2020-10-29 11:17:57 +00:00
Paul Duffin
bbd4fae4d7 Move boot jars package check to Soong
Passes the SKIP_BOOT_JARS_CHECK property through to Soong and removes
the boot jars check. Moves the check_boot_jars directory containing the
script and data file into build/soong/scripts.

Test: m check-boot-jars - for failing and passing cases
      verified manually that apart from path differences the same
      files (same check sum) were checked in both old make checks and
      the new Soong ones
Bug: 171479578
Change-Id: I61c128806065befce239bbdd5491567827e1b2f5
2020-10-29 11:07:55 +00:00
Yo Chiang
e73c5a074d Fix missing required dependency caused by circular dependency
Fix a bug where if module A requires module B, and for whatever reason
module A and B have some common installed files, then all required
dependencies of the common files would be lost.

For example:
```
 # A requires B
ALL_MODULES.A.INSTALLED := a
ALL_MODULES.B.INSTALLED := a b
```

Right now the build system wouldn't generate any dependency for `a`.
However the correct behavior should be: `a` has a order-only dependency
on `b`.

Bug: 157444528
Test: Check generated build-*.ninja
Change-Id: Iec60231f6597ec46077393d1defa109b9c07b208
2020-10-29 10:48:17 +00:00
Yifan Hong
78b55b2244 Mount generic ramdisk as readwrite.
With this change, first stage init can prepare and move
resources to accomodate devices with and without a dedicated
recovery partition.

Test: build with and without recovery partition, and manually inspect
Bug: 171512004

Change-Id: I7bd61f74c16ee77f3f05dc208e0f3cfe81e302b0
2020-10-28 17:05:18 -07:00
Yifan Hong
78860164d0 Do not put GENERIC_KERNEL_CMDLINE in recovery image.
The GENERIC_KERNEL_CMDLINE should only be in the generic boot image.
If device uses recovery-as-boot, it never uses generic boot image
because on devices with generic boot image, recovery resources are
moved to vendor_boot instead.

Bug: 171512004
Test: builds

Change-Id: Ia84e604a8ded28af39c7f1861ff5d3b3af55849f
2020-10-28 17:05:18 -07:00
Yifan Hong
c56931c173 Move common code out of the conditional.
Test: builds
Change-Id: I75e13b929dbdb31785a59898579ed14bcc3eef60
2020-10-28 17:05:18 -07:00
Yifan Hong
3941a876de Remove device-specific bits if recovery_as_boot
On legacy devices (launched with R and below), if device:
- has a vendor_boot partition, and
- uses recovery_as_boot

Then, when building the recovery/boot partition, the
device-specific bits, including dtb/kernel base/pagesize should
be moved to vendor_boot.

Previously, it is incorrectly assumed that A/B => recovery_as_boot.
In reality, we do have A/B devices with a dedicated recovery partition.

Note that for devices that uses GKI (BOARD_USES_GENERIC_KERNEL_IMAGE),
recovery_as_boot is never set to true. Instead, recovery resources
are moved to vendor_boot. On these devices, the conditional
'vendor_boot && recovery-as-boot' is always false. Hence:

- If the device has a dedicated recovery partition, it should use V3 header,
  and dtb/base/pagesize won't be in recovery header.
- If device does not have a dedicated recovery partition, the recovery
  image won't be built.

Test: builds
Change-Id: I0db2af20470cbe8a21044a984cccf264590aaccf
2020-10-28 17:05:18 -07:00
Yifan Hong
46aff099d2 Do not assume GKI just with vendor_boot.
This change ensures changes to GENERIC_KERNEL_CMDLINE only affects
devices that explicitly says it uses GKI/generic boot image.

In details, if the device has vendor_boot, but does not explicitly
specify that it uses GKI/generic boot image, do not include
GENERIC_KERNEL_CMDLINE in boot. boot cmdline is left empty
in this case.

The old logic:
- If device uses GKI *OR* has vendor_boot:
  boot uses GENERIC_KERNEL_CMDLINE, and do not include kernel base
  and pagesize.
  - If device has vendor_boot, INTERNAL_KERNEL_CMDLINE, kernel base
    and pagesize goes in vendor_boot.
- If device does not use GKI nor have vendor_boot:
  boot uses INTERNAL_KERNEL_CMDLINE, and includes kernel base and
  pagesize.

The new logic:
- If using GKI, boot uses GENERIC_KERNEL_CMDLINE. Remove kernel base
   and pagesize because they are device-specific.
- If not using GKI:
  - If building vendor_boot, INTERNAL_KERNEL_CMDLINE, base and
    pagesize goes in vendor_boot; boot does not have cmdline, base or
    pagesize.
  - Otherwise, put them in boot

Comparison of the code before and after:
- If device uses GKI,
  - For boot partition:
    - cmdline continues to be GENERIC_KERNEL_CMDLINE
    - kernel base and pagesize continues to be excluded
  - For vendor_boot partition:
    - cmdline continues to be INTERNAL_KERNEL_CMDLINE
    - kernel base and pagesize continues to be included
- If device does not use GKI:
  - If device has a vendor_boot partition:
    - For boot partition:
      * cmdline changes from GENERIC_KERNEL_CMDLINE to empty
      - kernel base and pagesize continues to be excluded
    - For vendor_boot partition:
      - cmdline continues to be INTERNAL_KERNEL_CMDLINE
      - kernel base and pagesize continues to be included
  - If device does not have a vendor_boot partition:
    - For boot partition:
      - cmdline continues to be INTERNAL_KERNEL_CMDLINE
      - kernel base and pagesize continues to be included

Test: builds
Bug: 171512004

Change-Id: I4feac435698f43ac299b430bff66147057865a62
2020-10-28 17:05:18 -07:00
android-build-team Robot
098cd4dc8d Make change and version bump to RQ2A.201029.001
Change-Id: I38961dcd2ab8b13e90051e85a2b49de97e4a4373
2020-10-28 23:17:12 +00:00
Joseph Murphy
77c15cb2d4 Changes Robolectric test suite tag to its own value to enable filtering these in ATP.
Bug: b/157635117
Change-Id: I7748ccbef3dd44d1a4a79e9ded5182607c83a20b
2020-10-28 01:09:18 +00:00
android-build-team Robot
710ef54e8e Make change and version bump to RQ2A.201028.001
Change-Id: Icbcf9c5c21d7ee2c50c1344c97b7b175ac8e0b50
2020-10-27 23:17:01 +00:00
Gao Xiang
961041ac80 Allow flashing erofs system imgs
Bug: 158339527
Test: build & boot
Signed-off-by: Gao Xiang <hsiangkao@redhat.com>
Change-Id: Ie74db8ebcd7214ffbec49d42b305b2f3ac2e8c9d
2020-10-28 01:24:39 +08:00
android-build-team Robot
70fe1e6458 Make change and version bump to RQ2A.201027.001
Change-Id: I04edd480e85c869c8c70e1342a7825daab21b7d7
2020-10-26 23:17:19 +00:00
Jaewoong Jung
a6c1730ba2 Merge "Remove duplicate quotation marks in apkcerts list." am: 3b27e9104b am: 1cafb2e586
Original change: https://android-review.googlesource.com/c/platform/build/+/1472645

Change-Id: I20413435865e03ca7041b8cbe948d57aa27ef09e
2020-10-26 19:52:20 +00:00
Jaewoong Jung
3b27e9104b Merge "Remove duplicate quotation marks in apkcerts list." 2020-10-26 19:05:00 +00:00
android-build-team Robot
43fa81981b Version bump to RQ2A.201026.002 [core/build_id.mk]
Change-Id: I0be1f9e4df413e3ccfb83b28dad0c36f9b98bab2
2020-10-26 17:45:22 +00:00
android-build-team Robot
cf58283589 Make change and version bump to RQ2A.201026.001
Change-Id: I282b6e09e83e30e43459cce29c168bc6ef07533c
2020-10-25 21:16:45 +00:00
android-build-team Robot
b0f2d77017 Make change and version bump to RQ2A.201025.001
Change-Id: I9513972d925130b6ef5aa6a1b4a7a61d61263fd3
2020-10-24 21:16:43 +00:00
Yifan Hong
9e88729664 Merge "Export BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT to Soong" am: a7a900e256 am: 438be712d9
Original change: https://android-review.googlesource.com/c/platform/build/+/1469693

Change-Id: Ib560fd4e9419571e4c4c94fc5b7c05bdd370d7bd
2020-10-24 01:26:23 +00:00
Yifan Hong
a7a900e256 Merge "Export BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT to Soong" 2020-10-24 01:08:16 +00:00
android-build-team Robot
21d635f56a Make change and version bump to RQ2A.201024.001
Change-Id: If124a343cd1686c3510614d5dd7011a2fbc8d645
2020-10-23 23:16:50 +00:00
Jaewoong Jung
7b634d345d Remove duplicate quotation marks in apkcerts list.
Fixes: 160845661
Test: Modify dialer cert string && m apkcerts-list
Change-Id: I9da8dd70185057b2e13793dd14387223dc29b052
2020-10-23 14:02:16 -07:00
Dan Shi
44899815ab Merge "Make *TS to include NOTICE file by default" am: e4d4188e4f am: 3641172258
Original change: https://android-review.googlesource.com/c/platform/build/+/1471255

Change-Id: I306f551236db3a460d38b7fca63f8caf1a727a3d
2020-10-23 16:37:09 +00:00
Dan Shi
e4d4188e4f Merge "Make *TS to include NOTICE file by default" 2020-10-23 16:09:35 +00:00
Martin Stjernholm
fa91696588 Merge "Rename ART release APEX to com.android.art." am: 48d34d8ac0 am: 603cd94611
Original change: https://android-review.googlesource.com/c/platform/build/+/1455024

Change-Id: I1b96e156320ff0410ddf4f824e25bd10f2a56a82
2020-10-23 11:05:19 +00:00
Martin Stjernholm
48d34d8ac0 Merge "Rename ART release APEX to com.android.art." 2020-10-23 10:03:24 +00:00
Dan Shi
413a53066b Make *TS to include NOTICE file by default
Bug: 170487545
Test: none
Change-Id: Ib3f726b847bc2123f0b564d0c3a8f5584720c021
2020-10-22 21:29:37 -07:00
android-build-team Robot
75b2689ace Make change and version bump to RQ2A.201023.001
Change-Id: Iafb432fa11dc4c901f70108832f91e388a326642
2020-10-22 23:19:37 +00:00