Commit Graph

76471 Commits

Author SHA1 Message Date
Michael Groover
9401efe64f Merge "Add support for -providerArg in signapk" am: 9d1a0a47d5
Original change: https://android-review.googlesource.com/c/platform/build/+/1760832

Change-Id: I83cb14090adff03179d354ad9fcdb839cd636498
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:05:09 +00:00
Michael Groover
9d1a0a47d5 Merge "Add support for -providerArg in signapk" 2022-05-12 17:40:31 +00:00
Colin Cross
265c1cc9a3 Merge "Remove HOST_DALVIK_*" am: 544aedda27
Original change: https://android-review.googlesource.com/c/platform/build/+/2059991

Change-Id: Icaaef9cc29cbaba05e461341c6ea4296983568d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 16:18:27 +00:00
Colin Cross
544aedda27 Merge "Remove HOST_DALVIK_*" 2022-05-12 15:44:20 +00:00
Treehugger Robot
006413cb62 Merge "Remove -j1 for aidl-freeze-api" am: b4eef93771
Original change: https://android-review.googlesource.com/c/platform/build/+/2095383

Change-Id: I2a5010615d9ffcc19521d120c05eba0e7a48951e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 00:57:31 +00:00
Treehugger Robot
0221a9a4af Merge "Remove all_product_makefiles" am: a09c684e27
Original change: https://android-review.googlesource.com/c/platform/build/+/2095123

Change-Id: I67640034a8876c10b10c0c99a0dc6be63a6e3fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 00:56:03 +00:00
Treehugger Robot
b4eef93771 Merge "Remove -j1 for aidl-freeze-api" 2022-05-11 23:12:07 +00:00
Michael Groover
2f8aad4f7f Add support for -providerArg in signapk
signapk currently accepts a Provider class that can be instantiated
and inserted before the signing. This commit adds support to specify
a -providerArg parameter that can be used to configure the Provider.
Prior to JDK 9 a Provider would accept a providerArg in a constructor
accepting a String; in JDK 9+ a Provider should first be instantiated
with the zero-arg constructor, then the configure method should be
called with the providerArg.

Bug: 142334653
Bug: 190974913
Fixes: 232134730
Test: Manually verified new Provider can be inserted with pre- and
      post-JDK 9 behavior.
Change-Id: I96f027640c59d3357e8dcf656626d1601bfef861
2022-05-11 21:55:24 +00:00
Cole Faust
6d0c689c23 Merge "Add function for flattening 2d lists" am: 8ccac5198d
Original change: https://android-review.googlesource.com/c/platform/build/+/2088663

Change-Id: I01809fe3d1c11d74e3284a16dcd6f3834db5fc38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:37:13 +00:00
Treehugger Robot
b2d8f7f5b9 Merge "Temporary hack for making T->S downgrade work" am: 4890a4ea35
Original change: https://android-review.googlesource.com/c/platform/build/+/2092783

Change-Id: I5c9099a800dc40e459293c4144c5910f911156fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:36:22 +00:00
Treehugger Robot
a09c684e27 Merge "Remove all_product_makefiles" 2022-05-11 18:31:14 +00:00
Colin Cross
a9203e6d87 Remove HOST_DALVIK_*
There are no more BUILD_HOST_DALVIK_* modules, remove the host dalvik
support.  The equivalent support in Soong just copies the device dex
file to the host dalvik location.

Test: m checkbuild
Change-Id: I4bcf916518317b28d3217994b2fe9ee95d7f50d6
2022-05-11 08:17:45 -07:00
Jeongik Cha
26e9dd30a4 Remove -j1 for aidl-freeze-api
Because bpmodify is safe in multi-process env.

Bug: 190577319
Bug: 229413853
Test: aidl-freeze-api
Change-Id: Ie47afc25e2259bbcbbff50f98fa9d36887558d27
2022-05-11 01:25:19 +00:00
Cole Faust
4edc0b30ff Remove all_product_makefiles
It was unused, along with all_product_configs.

Bug: 228518445
Test: Presubmits
Change-Id: Ibd105241581f8b03254b8fee382d916ea3a98890
2022-05-10 15:39:10 -07:00
Cole Faust
8ccac5198d Merge "Add function for flattening 2d lists" 2022-05-10 05:26:03 +00:00
Treehugger Robot
4890a4ea35 Merge "Temporary hack for making T->S downgrade work" 2022-05-10 04:23:32 +00:00
Kelvin Zhang
9a698e6a9f Temporary hack for making T->S downgrade work
Downgrade OTA was broken because generic_ramdisk was removed from boot
partition in android T. Neither does O6 have init_boot. O6 also doesn't
include generic ramdisk in vendor boot, so no way for otatools to locate
contents of generic ramdisk. As a hack, omit boot partition timestamp if
we can't find ramdisk.

Test: generate T->S downgrade OTA for O6
Bug: 231656318
Change-Id: I9f5359462332aadadc324348873a3a4b2b126068
2022-05-09 10:20:52 -07:00
Treehugger Robot
e654cbdfcd Merge "Disable verity for VABC updates on android R" am: 46c4bb37d1
Original change: https://android-review.googlesource.com/c/platform/build/+/2087483

Change-Id: I18376fe419fe6f73e47e88e2474ac4f91160f7b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 00:21:04 +00:00
Treehugger Robot
46c4bb37d1 Merge "Disable verity for VABC updates on android R" 2022-05-06 00:03:20 +00:00
Cole Faust
6f6060a358 Add function for flattening 2d lists
Bug: 226974242
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: Iae977b34ca0ac156ec795c54f4951c769fa994dd
2022-05-05 11:41:59 -07:00
Ulya Trofimovich
98a1730bf9 Merge "Extend hardcoded list of optional uses-libraries." am: de1949b562
Original change: https://android-review.googlesource.com/c/platform/build/+/2087124

Change-Id: I771069885c7e992ae019a26ccd117ce39860a71d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 13:33:52 +00:00
Ulya Trofimovich
de1949b562 Merge "Extend hardcoded list of optional uses-libraries." 2022-05-05 12:57:54 +00:00
Treehugger Robot
d436fa704b Merge "envsetup.sh: fix adb tab completion" am: 1ef63b944e
Original change: https://android-review.googlesource.com/c/platform/build/+/2087123

Change-Id: I9324867e6b23d6288150ac045bcfb724a381de08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 09:07:17 +00:00
Treehugger Robot
1ef63b944e Merge "envsetup.sh: fix adb tab completion" 2022-05-05 07:52:42 +00:00
Kelvin Zhang
a9a87ec204 Disable verity for VABC updates on android R
Bug: 230277030
Test: th
Change-Id: I2872c490c852fb7d3784721e191ece80b4b1fd58
2022-05-04 16:45:14 -07:00
Xin Li
56c9d9b5ea [automerger skipped] Merge "Merge SP2A.220505.002" am: c01930f7d7 -s ours
am skip reason: Merged-In I5a35451e14cba5f115ab66926d62c4fa4556a267 with SHA-1 8f3602319f is already in history

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

Change-Id: Ib821389aff4cc0784dd97c936b0e4c78779901e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 20:57:09 +00:00
Xin Li
490ab8841f [automerger skipped] Merge SP2A.220505.002 am: a08bbcebb4 -s ours
am skip reason: Merged-In I5a35451e14cba5f115ab66926d62c4fa4556a267 with SHA-1 8f3602319f is already in history

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

Change-Id: I1410efe84d6b8cba3362f1e6d956f8cae0693afe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 20:56:54 +00:00
Xin Li
c01930f7d7 Merge "Merge SP2A.220505.002" 2022-05-04 20:30:21 +00:00
Treehugger Robot
14e4ad63e5 Merge "fixup! Embed host liblz4.so in target_files" am: 5161627644
Original change: https://android-review.googlesource.com/c/platform/build/+/2083403

Change-Id: Id1a30721887e9d46e169f4ecc71d47414b69265f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:11:55 +00:00
Treehugger Robot
5161627644 Merge "fixup! Embed host liblz4.so in target_files" 2022-05-04 17:23:40 +00:00
Mårten Kongstad
cb5c73fd9e envsetup.sh: fix adb tab completion
The adb module has been moved from system/core to packages/modules/adb.
Update the path to the adb tab completion script accordingly.

Also teach envsetup.sh to complain if completion files are not found.

Test: manual: adb tab completion works
Test: source build/envsetup.sh && declare -F _adb
Change-Id: I7d6fda3813b95e64de7b1953675f66659e750c31
2022-05-04 14:47:20 +00:00
Ulya Trafimovich
0932a821c0 Extend hardcoded list of optional uses-libraries.
This is a temporary workaround that should be replaced with build logic
that would propagate optionality via generated exported-sdk-libs files.

Bug: 214255490
Test: lunch aosp_cf_x86_64_phone-userdebug && m && launch_cvd \
    && adb wait-for-device && adb root \
    && adb logcat | grep -E 'ClassLoaderContext [a-z ]+ mismatch'
    # empty output, no errors at boot
Change-Id: I05e22e5f72a9f936b6e0010240f5e71849a9b2b0
2022-05-04 13:36:47 +01:00
Treehugger Robot
73590ef083 Merge "Only enable zucchini if configuration file exists" am: 7b53ae67f1
Original change: https://android-review.googlesource.com/c/platform/build/+/2085423

Change-Id: I02323ad00549c82fa8818e05f6dad47a1664fe53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 03:20:08 +00:00
Treehugger Robot
7b53ae67f1 Merge "Only enable zucchini if configuration file exists" 2022-05-04 02:39:39 +00:00
Treehugger Robot
5e7a364724 Merge "Adding -j1 for aidl-freeze-api" am: 83b8158d3e
Original change: https://android-review.googlesource.com/c/platform/build/+/2083945

Change-Id: I87d67a0722126a5859a8332f0e1f0479f75fca89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:07:37 +00:00
Treehugger Robot
83b8158d3e Merge "Adding -j1 for aidl-freeze-api" 2022-05-04 01:15:38 +00:00
Xin Li
a08bbcebb4 Merge SP2A.220505.002
Bug: 231319788
Merged-In: I5a35451e14cba5f115ab66926d62c4fa4556a267
Change-Id: Iebd16f49429a66da431c4277c60de7030b55b7a5
2022-05-03 20:54:36 +00:00
Treehugger Robot
db91e4b4f4 Merge "Remove RBC_BOARD_CONFIG" am: 7d2d41ce2e
Original change: https://android-review.googlesource.com/c/platform/build/+/2084523

Change-Id: Ibdaa6580668f405aad7aac736c652ec7fb0702b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 17:44:31 +00:00
Treehugger Robot
7d2d41ce2e Merge "Remove RBC_BOARD_CONFIG" 2022-05-03 17:22:56 +00:00
Håkan Kvist
3db1ef61de Only enable zucchini if configuration file exists
Only enable zucchini if configuration file zucchini_config.txt exits
in target files and version in source and target is the same.

Without this patch zucchini would be enabled if configuration file
was missing from both target files.

Bug: 231204699
Test: Run ota package generation with zucchini_config.txt missing from
      both source and target zips. Confirm that zucchini is disabled.
Change-Id: Ia34998fd911d5860b38fe49fa5a88056a22d661e
2022-05-03 13:00:32 +02:00
Treehugger Robot
fbfd46e545 Merge "Expose GetRamdiskFormat and use in ota_utils.py" am: 98050a4e97
Original change: https://android-review.googlesource.com/c/platform/build/+/2084045

Change-Id: Idef4053429bbabd96047a2e0624b77d4a3d80f70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 09:09:11 +00:00
Treehugger Robot
98050a4e97 Merge "Expose GetRamdiskFormat and use in ota_utils.py" 2022-05-03 08:27:35 +00:00
Treehugger Robot
77bd852ff0 Merge "Merge identical key/val pairs in dynamic partition info" am: d9e0788ee7
Original change: https://android-review.googlesource.com/c/platform/build/+/2084183

Change-Id: Ibfe4ca77324e5240340ccb17e0877f792c85d4e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 05:05:07 +00:00
Treehugger Robot
d9e0788ee7 Merge "Merge identical key/val pairs in dynamic partition info" 2022-05-03 02:37:34 +00:00
Treehugger Robot
911a63c0ff Merge "Add 33.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" am: 7a79a27356
Original change: https://android-review.googlesource.com/c/platform/build/+/2082702

Change-Id: I61a443f962f39d1163a8f01b5e239b68580fd92c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 02:21:49 +00:00
Jeongik Cha
9c376b4ec8 Adding -j1 for aidl-freeze-api
bpmodify isn't safe for multi processes env because it doesn't use any
lock mechanism even with -w option(in-place change)

So, added -j1 option as a temp solution.

Bug: 190577319
Bug: 229413853
Test: run aidl-freeze-api with -j1
Change-Id: I7fabfa1224ea0bb8d71538f4c8012255df28a3e8
2022-05-03 01:51:06 +00:00
Treehugger Robot
7a79a27356 Merge "Add 33.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" 2022-05-03 00:32:17 +00:00
Cole Faust
127115190b Remove RBC_BOARD_CONFIG
Always enable the rbc board config along with
the product config now that board config works
well.

Bug: 231224938
Test: Presubmits
Change-Id: I52a79d53dfe54878477ee015bd21863c4cee6b05
2022-05-02 14:16:04 -07:00
TJ Rhoades
6f488e9e33 Expose GetRamdiskFormat and use in ota_utils.py
Some OTA files may have additional OTA props; when this is being computed within
ota_utils.py -> ComputeRuntimeBuildInfos, the ramdisk type needs to be passed into
PartitionBuildProps.FromInputFile as not all ramdisk may still use gzip. This check
is already defined in common.py, so this change also exposes the function GetRamdiskFormat.

Bug: 231075507

Signed-off-by: TJ Rhoades <tjr@microsoft.com>
Change-Id: If1b93b887990f0d90df2c6003122821c1e66a1ac
2022-05-02 13:19:49 -07:00
Kelvin Zhang
6a683ce02b Merge identical key/val pairs in dynamic partition info
We might add new values to dynamic_partition_info.txt, so some kind of
generic fallback mechanism is needed. If keys are different, we need to
decided on a case-by-case basis which side takes precedence. For
example, Virtual AB requires vendor support, so vendor side takes
precedence. VABC on T+ devices are implemented entirely in system, so
system/framework side takes precedence.

Bug: 230876542
Test: th
Change-Id: I67747368547d3ef3e29ad64f8f818ef4c5896246
2022-05-02 12:19:45 -07:00