Commit Graph

66240 Commits

Author SHA1 Message Date
Treehugger Robot 849591302b Merge "Checks for APK sharedUserIds that cross partition group boundaries." am: ba1811bf83
Original change: https://android-review.googlesource.com/c/platform/build/+/1480660

Change-Id: I76197312aadf243fd49c910a598f3527c9d554ba
2020-11-06 23:04:51 +00:00
Dan Shi 705d652767 Create a new test zip for hostside unittest
Bug: 172006742
Test: m
Change-Id: Idb82b508d3c49d19f1a76de4311bc0616e1ffa49
2020-11-06 23:00:11 +00:00
Treehugger Robot ba1811bf83 Merge "Checks for APK sharedUserIds that cross partition group boundaries." 2020-11-06 22:29:46 +00:00
Yifan Hong 38d4d432b7 Merge "Install e2fsck_ramdisk to GKI ramdisk." am: 97c8455634
Original change: https://android-review.googlesource.com/c/platform/build/+/1489086

Change-Id: I9a6e0ec38f90ed361a83edfff3fa3f0f4664b209
2020-11-06 19:27:44 +00:00
Yifan Hong 97c8455634 Merge "Install e2fsck_ramdisk to GKI ramdisk." 2020-11-06 19:17:15 +00:00
Yifan Hong 84ae75cd3c Install e2fsck_ramdisk to GKI ramdisk.
Test: build and inspect output
Bug: 172603832
Fixes: 171326057
Change-Id: If656efdea8a503dc837f23898a5f0ed56884eda4
2020-11-06 10:28:03 -08:00
Treehugger Robot e2aef95b2d Merge "Phase out Legacy GSI" am: a0aebc1081
Original change: https://android-review.googlesource.com/c/platform/build/+/1485796

Change-Id: I86e6382b26dabef97873ff7a1f6bcee8c2ad2a3b
2020-11-06 04:19:30 +00:00
Treehugger Robot a0aebc1081 Merge "Phase out Legacy GSI" 2020-11-06 04:00:40 +00:00
Treehugger Robot acbf88c241 Merge "Add a rule to get numbers greater or equal to a minimum number." am: 354cafe42a
Original change: https://android-review.googlesource.com/c/platform/build/+/1480277

Change-Id: I15463a290650a67d4e4fb36a9f4ce2363ad9d5b7
2020-11-06 02:13:08 +00:00
JaeMan Park afdd39fd10 Add java sdk library enforcement flag
Add java sdk library enforcement for inter-partition library
dependency, for ensuring backward-compatible libraries for
inter-partition dependencies.

Test: m nothing
Bug: 168180538
Change-Id: I6bfac54c3499b03003a3bc6c2bb62b165b4ce5f9
2020-11-06 01:34:39 +00:00
Treehugger Robot 354cafe42a Merge "Add a rule to get numbers greater or equal to a minimum number." 2020-11-06 01:17:38 +00:00
Elliott Hughes c2039151ba Run zipalign tests in presubmit.
Test: treehugger
Change-Id: I2779c04313976d29c29c50920c0b356309c08439
2020-11-05 16:37:40 -08:00
Daniel Norman d33515623a Checks for APK sharedUserIds that cross partition group boundaries.
This check is used when merging target files to ensure that a merged
build does not contain any APKs that share UID across builds.

Bug: 171431774
Test: test_common
Test: Use merge_target_files.py to merge two partial builds,
      observe no failures for inputs without colliding APKs.
Test: Use merge_target_files.py to merge two partial builds,
      observe failure for inputs that have an APK that shares a
      UID across input partition groups.
Change-Id: I9dc57216882741ae46a99cfd7847f34702c75582
2020-11-05 15:17:05 -08:00
Treehugger Robot af00a45d17 Merge "Switch ramdisk.img to the LZ4 format" am: d41b82563f
Original change: https://android-review.googlesource.com/c/platform/build/+/1489080

Change-Id: Ibe691e3485a92530ff0aa33e5f04ccd00405dc51
2020-11-05 22:01:11 +00:00
Treehugger Robot d41b82563f Merge "Switch ramdisk.img to the LZ4 format" 2020-11-05 21:30:28 +00:00
Treehugger Robot 56a21ac807 Merge "Refactor zipalign to allow unit tests" am: 6be3371c23
Original change: https://android-review.googlesource.com/c/platform/build/+/1486436

Change-Id: Ica3d6bfd083ed748286ca45a38d746cd8120bd3f
2020-11-05 19:23:33 +00:00
Treehugger Robot 6be3371c23 Merge "Refactor zipalign to allow unit tests" 2020-11-05 19:10:22 +00:00
Roman Kiryanov 49803e35b9 Switch ramdisk.img to the LZ4 format
Bug: 169336853
Test: file out/target/product/emulator_x86_64/ramdisk.img
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I085d230a49cd92cc7fe3a620eec411d0e8b90667
2020-11-05 10:47:55 -08:00
Nikita Ioffe 058ef86ac3 Merge "Revert^2 "Add a check for apex/allowed_deps.txt to droidcore."" am: bcfaaf9eb2
Original change: https://android-review.googlesource.com/c/platform/build/+/1486317

Change-Id: I63df000a4182c472f0c90cebba91993c8556f30e
2020-11-05 14:11:34 +00:00
Nikita Ioffe bcfaaf9eb2 Merge "Revert^2 "Add a check for apex/allowed_deps.txt to droidcore."" 2020-11-05 14:02:33 +00:00
android-build-team Robot a95305b81f Version bump to RQ1A.201205.010 [core/build_id.mk]
Change-Id: If81905c947ee0cf2ba991830b6559ed553a18d68
2020-11-05 04:08:27 +00:00
Bill Yi 753e76ea08 Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: f785ca2d76
Original change: https://android-review.googlesource.com/c/platform/build/+/1487678

Change-Id: Idf1e31f9408d43b1142a4ad71203d3f1f329ad74
2020-11-05 03:01:48 +00:00
Bill Yi 463ba99196 Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: 02ffec116f
Original change: https://android-review.googlesource.com/c/platform/build/+/1487678

Change-Id: Iba1c7e36c2993502b3bc511115c63618789d0f62
2020-11-05 03:01:14 +00:00
Bill Yi f785ca2d76 Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" 2020-11-05 01:06:54 +00:00
Bill Yi 02ffec116f Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE
Merged-In: I2ac90f493820187f3b694a4113faeb5dbcaa9299
Change-Id: Ie492eadd3091d1ed077eb86d6ebfc318b5db2284
2020-11-04 14:04:04 -08:00
Treehugger Robot 101dc0e0d7 Merge "Finds APK shared UID violations when merging target files." am: 50c0f97fe7
Original change: https://android-review.googlesource.com/c/platform/build/+/1477396

Change-Id: I593b41fadd040a78b69be7031ecad813b4821e73
2020-11-04 21:55:15 +00:00
Treehugger Robot 50c0f97fe7 Merge "Finds APK shared UID violations when merging target files." 2020-11-04 21:44:40 +00:00
Yi Kong a216a3e2c6 Merge "Add profcollect to PLATFORM_PACKAGES_DEBUG" am: da1cf9f1c1
Original change: https://android-review.googlesource.com/c/platform/build/+/1485800

Change-Id: If2247adadb104feb12316f4ffb7e836bd661f5b8
2020-11-04 19:24:14 +00:00
Yi Kong da1cf9f1c1 Merge "Add profcollect to PLATFORM_PACKAGES_DEBUG" 2020-11-04 19:07:25 +00:00
Bill Yi 7a4e6a9bdc Merge "Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2020-11-04 18:18:23 +00:00
Kelvin Zhang d49c495b8c Merge "Disable FEC computation for VABC" am: 28ebef7f96
Original change: https://android-review.googlesource.com/c/platform/build/+/1486756

Change-Id: I3bc83822ca75f062dcb2197a5413c38a911ee75d
2020-11-04 15:02:57 +00:00
Kelvin Zhang 28ebef7f96 Merge "Disable FEC computation for VABC" 2020-11-04 14:30:33 +00:00
Treehugger Robot 5e0a0063d8 Merge "Export SOONG_HOST_OUT as ANDROID_SOONG_HOST_OUT" am: 3bb52acee0
Original change: https://android-review.googlesource.com/c/platform/build/+/1485156

Change-Id: I5b9206f0c5a711e4d355e79e79fd102e4b992828
2020-11-04 13:00:05 +00:00
Treehugger Robot 3bb52acee0 Merge "Export SOONG_HOST_OUT as ANDROID_SOONG_HOST_OUT" 2020-11-04 12:49:09 +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
Yi Kong 25328f5cb9 Add profcollect to PLATFORM_PACKAGES_DEBUG
... but it does not get turned on automatically. This is controlled by
profcollect_native_boot.enabled device config.

Test: boot device and verify profcollectd is disabled by default
Bug: 79161490
Change-Id: Ia91b9759e108896f275633e3156355b65dc94299
2020-11-04 09:44:27 +08:00
Treehugger Robot e383447ffe Merge "Add keystore2 to PLATFORM_PACKAGES" am: c0f701287c
Original change: https://android-review.googlesource.com/c/platform/build/+/1479457

Change-Id: I889c55a06e42ffb2042abdeaeb0a2d42999a923c
2020-11-03 21:08:21 +00:00
Kelvin Zhang 31233e5922 Disable FEC computation for VABC
Test: treehugger, generate a package and make sure --disable_fec is
passed to delta_generator

Change-Id: If256af90b11a7fa03299c1272466d35ef3798a24
2020-11-03 15:45:30 -05:00
Treehugger Robot c0f701287c Merge "Add keystore2 to PLATFORM_PACKAGES" 2020-11-03 20:37:23 +00:00
Yifan Hong edd0abfbc0 Merge "Enable BOARD_USES_GKI on aosp_arm64" am: 4503e6e383
Original change: https://android-review.googlesource.com/c/platform/build/+/1455954

Change-Id: I7a4789b43884a3f3d469ab3993a1d0c385772dd8
2020-11-03 18:29:50 +00:00
Yifan Hong 4503e6e383 Merge "Enable BOARD_USES_GKI on aosp_arm64" 2020-11-03 18:17:13 +00:00
Fabien Sanglard 0f29f54695 Refactor zipalign to allow unit tests
Test: Self-tested
Bug: NA
Change-Id: I322b78c5e18082f7abf7427cdc62dbabcb18b4a0
2020-11-03 10:03:30 -08: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
SzuWei Lin d418471390 Phase out Legacy GSI
Legacy GSI is the GSI for the O/O-MR1 launching devices. VINTF and
VNDK do not support O/O-MR1 now. It is the time to phase out Legacy
GSI.

Bug: 162277261
Test: none
Change-Id: I55901604da21daa58b51ee6676cd61bb9e4ff5e6
2020-11-03 18:23:57 +08:00
Jiyong Park c02b1c463e Export SOONG_HOST_OUT as ANDROID_SOONG_HOST_OUT
Some host tools (launch_cvd, etc.) have been using HOST_OUT.
As their dependencies are now installed by soong, the tools should refer
to SOONG_HOST_OUT. Export it as ANDROID_SOONG_HOST_OUT.

Bug: 172065015
Test: build aosp_cf_x86_phone, execute launch_cvd
Change-Id: Ie175049f15b89485feec0d33d82e756b12a7ad8a
2020-11-03 11:06:39 +09:00
Treehugger Robot ad6949c590 Merge "Fix partition timestamps for secondary payload" am: 0806152b83
Original change: https://android-review.googlesource.com/c/platform/build/+/1481896

Change-Id: I1d400cd5ec93103b6610c0b5be98b236eb3fd775
2020-11-02 21:33:22 +00:00
Treehugger Robot 0806152b83 Merge "Fix partition timestamps for secondary payload" 2020-11-02 21:22:17 +00:00
Yifan Hong c10e367912 Enable BOARD_USES_GKI on aosp_arm64
Enable BOARD_USES_GENERIC_KERNEL_IMAGE := true. In addition:
- Disable recovery_as_boot
- Disable recovery (PRODUCT_BUILD_RECOVERY_IMAGE=false)

Test: builds, and mmma packages/modules/Gki
Bug: 156098440
Change-Id: If6988f6b44f098ed8f1dc214eee1f2223fd03ae8
2020-11-02 11:28:20 -08:00