Commit Graph

86485 Commits

Author SHA1 Message Date
Jiakai Zhang
c63a2b36d7 Avoid using soong_zip's "-e" flag for boot.zip.
aosp/23658853 changes boot.zip, which need to be cherry-picked to UDC.
It uses soong_zip's "-e" flag to specify the filename to use in boot.zip
for METADATA.txt. However, the "-e" flag doesn't exist on UDC. This
change uses an alternative approach to avoid using the "-e" flag.

Before this change, the contents were written to
out/dist/boot.zip.METADATA.txt and then passed to soong_zip with "-e" to
rename to file to "METADATA.txt".

After this change, the contents are written to
out/dist/boot_zip/METADATA.txt and then passed to soong_zip with "-j" to
remove the directory name.

Bug: 286381070
Test: m dist out/dist/boot.zip (on udc-dev)
(cherry picked from https://android-review.googlesource.com/q/commit:34914f620bcc0339104ef0360f6a30492f407409)
Merged-In: I769de5194b5716f05e5352f4efd635a70ba0b891
Change-Id: I769de5194b5716f05e5352f4efd635a70ba0b891
2023-06-12 16:28:51 +00:00
Jiakai Zhang
dac9d66a75 Add mainline extension and METADATA.txt to boot.zip.
Contents of METADATA.txt:

booclasspath = dex_bootjars_input/core-oj.jar:dex_bootjars_input/core-libart.jar:dex_bootjars_input/okhttp.jar:dex_bootjars_input/bouncycastle.jar:dex_bootjars_input/apache-xml.jar:dex_bootjars_input/framework.jar:dex_bootjars_input/framework-graphics.jar:dex_bootjars_input/ext.jar:dex_bootjars_input/telephony-common.jar:dex_bootjars_input/voip-common.jar:dex_bootjars_input/ims-common.jar:dex_bootjars_input/core-icu4j.jar:apex_bootjars/framework-adservices.jar:apex_bootjars/framework-sdksandbox.jar:apex_bootjars/framework-appsearch.jar:apex_bootjars/framework-bluetooth.jar:apex_bootjars/conscrypt.jar:apex_bootjars/android.net.ipsec.ike.jar:apex_bootjars/updatable-media.jar:apex_bootjars/framework-mediaprovider.jar:apex_bootjars/framework-ondevicepersonalization.jar:apex_bootjars/framework-statsd.jar:apex_bootjars/framework-permission.jar:apex_bootjars/framework-permission-s.jar:apex_bootjars/framework-scheduling.jar:apex_bootjars/framework-sdkextensions.jar:apex_bootjars/framework-connectivity.jar:apex_bootjars/framework-connectivity-t.jar:apex_bootjars/framework-tethering.jar:apex_bootjars/framework-uwb.jar:apex_bootjars/framework-virtualization.jar:apex_bootjars/framework-wifi.jar
booclasspath-locations = /apex/com.android.art/javalib/core-oj.jar:/apex/com.android.art/javalib/core-libart.jar:/apex/com.android.art/javalib/okhttp.jar:/apex/com.android.art/javalib/bouncycastle.jar:/apex/com.android.art/javalib/apache-xml.jar:/system/framework/framework.jar:/system/framework/framework-graphics.jar:/system/framework/ext.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/ims-common.jar:/apex/com.android.i18n/javalib/core-icu4j.jar:/apex/com.android.adservices/javalib/framework-adservices.jar:/apex/com.android.adservices/javalib/framework-sdksandbox.jar:/apex/com.android.appsearch/javalib/framework-appsearch.jar:/apex/com.android.btservices/javalib/framework-bluetooth.jar:/apex/com.android.conscrypt/javalib/conscrypt.jar:/apex/com.android.ipsec/javalib/android.net.ipsec.ike.jar:/apex/com.android.media/javalib/updatable-media.jar:/apex/com.android.mediaprovider/javalib/framework-mediaprovider.jar:/apex/com.android.ondevicepersonalization/javalib/framework-ondevicepersonalization.jar:/apex/com.android.os.statsd/javalib/framework-statsd.jar:/apex/com.android.permission/javalib/framework-permission.jar:/apex/com.android.permission/javalib/framework-permission-s.jar:/apex/com.android.scheduling/javalib/framework-scheduling.jar:/apex/com.android.sdkext/javalib/framework-sdkextensions.jar:/apex/com.android.tethering/javalib/framework-connectivity.jar:/apex/com.android.tethering/javalib/framework-connectivity-t.jar:/apex/com.android.tethering/javalib/framework-tethering.jar:/apex/com.android.uwb/javalib/framework-uwb.jar:/apex/com.android.virt/javalib/framework-virtualization.jar:/apex/com.android.wifi/javalib/framework-wifi.jar
boot-image = system/framework/boot.art:system/framework/boot-framework-adservices.art

Bug: 286381070
Test: m dist out/dist/boot.zip
(cherry picked from https://android-review.googlesource.com/q/commit:a5551c5d91ce236e775bfc61fb3d6b7cdeb07b50)
Merged-In: I258479ffbdf199091290b074329ff1b43db2e669
Change-Id: I258479ffbdf199091290b074329ff1b43db2e669
2023-06-12 16:28:18 +00:00
Dennis Shen
4c5aca71c4 Create otatools build target with dist am: fa04b8d7ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23566986

Change-Id: I9d6aa1103997d0c9ca42679dda3a74cc590def21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 12:57:04 +00:00
Dennis Shen
fa04b8d7ed Create otatools build target with dist
Ignore-AOSP-First: cherry pick of aosp/2515235

BUG: b/275545565
TEST: m otatools-dist dist
Change-Id: I8484a7927955bf694221937ba778db7065b83eb2
2023-06-05 20:14:00 +00:00
Treehugger Robot
cd3752d163 Merge "Support dynamic 64-bit drmserver" into udc-dev 2023-06-01 23:22:32 +00:00
Spandan Das
593b2e5ce4 Create default PRODUCT_INCLUDE_TAGS in product_config
In the current setup in partner branch, we
1. Add blueprint_package_includes to prebuilts/module_sdk/*
2. Add the correct PRODUCT_INCLUDE_TAGS to partner_modules

This means in those setups,none of the prebuilts are visible to aosp products since
they they do not inherit partner_module makefiles.
```
e.g.
prebuilts/module_sdk/art/current/Android.bp
prebuilts/module_sdk/art/<go_specific>/current/Android.bp

// aosp_arm cannot find either

```

To solve this, this CL creates a default inclusion tag for all products
that do not set any PRODUCT_INCLUDE_TAGS explicitly.
In the previous example, Soong analysis of aosp_* will use
prebuilts/module_sdk/art/current/Android.bp. This should be a no-op for
aosp and internal branches since none of the Android.bp files today contains
blueprint_package_includes

Test: m nothing for aosp_arm in the test branch of b/278604467#comment20
Test: m nothing for partner product that uses big android sdk
Test: m nothing for partner product that uses go sdk

Bug: 278604467
(cherry picked from https://android-review.googlesource.com/q/commit:2e69ea622877e7f88b82db4adbc284b9342f8c2c)
Merged-In: I322b52c34ed339989207609dd0fd23c27ed1f697
Change-Id: I322b52c34ed339989207609dd0fd23c27ed1f697
cp required as per b/278604467#comment25
2023-05-25 16:50:39 +00:00
Wei Li
6284936f20 Add upstream package of a prebuilt fork package, which will have the package information from the METADATA file.
Bug: 266726655
Test: CIs
Test: lunch barbet-user && m sbom
(cherry picked from https://android-review.googlesource.com/q/commit:16e7aa3c2ea779ff91a0d88b431a2437964ae1a6)
Merged-In: Ic8eb42c369de8c94c7977b9631ff4b9084dfef01
Change-Id: Ic8eb42c369de8c94c7977b9631ff4b9084dfef01
2023-05-23 23:12:36 +00:00
Yihan Dong
a75b82f9d2 Merge "Remove GTS-Verifier license check" into udc-dev 2023-05-23 02:00:54 +00:00
Satoshi Futenma
792dfa537a Add merge_ota to otatools
Bug: 282189563
Test: manual, m otatools-package, confirm that merga_ota is
    present in otatools.zip
(cherry picked from https://android-review.googlesource.com/q/commit:6d56d45f96cc1f4e45141bfd04cd92551451d3f5)
Merged-In: I40c3866bfb016aa1dec1c6dc2d95c66deb1e61ea
Change-Id: I40c3866bfb016aa1dec1c6dc2d95c66deb1e61ea
2023-05-22 17:31:49 +00:00
Wei Li
f96858a818 Merge changes from topic "cherrypicker-L80700000960770298:N69600001370607907" into udc-dev
* changes:
  Some changes to support SBOM generation for b build unbundled APEXs.
  Export some make variables to soong.variables.
2023-05-19 21:37:23 +00:00
Yihan Dong
58c428e336 Remove GTS-Verifier license check
The whole GTS-Verifier will be removed. Before that, remove GTS-V
license check first.

Ignore-AOSP-First: This CL must be submit with other CLs in the topic to avoid breaking the test. This CL will be cherry pick to AOSP after submitting.

Bug: 283384166
Test: m gts
Change-Id: I5bc8c1f4609f55cedd5bfbed014b65de164e2b16
2023-05-19 10:38:55 +00:00
Steve Berbary
98b4c2d908 [automerger skipped] Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e am: 666a64473b -s ours am: 8dc00cfae4 -s ours am: fb5d27605d -s ours am: 7080fa2583 -s ours am: 240278dfc7 -s ours
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 26a7d4bd9e is already in history

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

Change-Id: I32880c20bd48be3cc4afda27cc61845756b0b124
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 01:23:23 +00:00
Steve Berbary
240278dfc7 [automerger skipped] Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e am: 666a64473b -s ours am: 8dc00cfae4 -s ours am: fb5d27605d -s ours am: 7080fa2583 -s ours
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 26a7d4bd9e is already in history

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

Change-Id: Id8624de6bed7e22cb79c8ae6dd4dec1a2ff6ad41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 00:43:43 +00:00
Steve Berbary
1a0f37dfe6 [automerger skipped] Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e am: 666a64473b -s ours am: 8dc00cfae4 -s ours am: fb5d27605d -s ours am: 6430535916 -s ours
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 26a7d4bd9e is already in history

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

Change-Id: I7d4e0ba80a5d153eecc19b72a5b0b7d2fa96973b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 00:40:21 +00:00
Wei Li
233d5b97f8 Some changes to support SBOM generation for b build unbundled APEXs.
1) Use output file path of installed files in build system since there is no PRODUCT_OUT in Bazel
2) Use CONTAINS to describe the relationship between a APEX and files it contains
3) Generate SBOM of APEXs, which is similar to SBOM of products

Bug: 275472038
Test: CIs
(cherry picked from https://android-review.googlesource.com/q/commit:fd7e6517d345d3b8d4af12dae345434d968b83b9)
Merged-In: I41622366e5e6ed9dc78cca7bc7bb69a1f8f9bd9f
Change-Id: I41622366e5e6ed9dc78cca7bc7bb69a1f8f9bd9f
2023-05-19 00:35:20 +00:00
Wei Li
d637b06d8f Export some make variables to soong.variables.
Bug: 275472038
Test: CIs
(cherry picked from https://android-review.googlesource.com/q/commit:996830047f79a5b9e9c9ed590886217068d9576e)
Merged-In: I2e7a07007224364418659453d979e2bee58fe5f9
Change-Id: I2e7a07007224364418659453d979e2bee58fe5f9
2023-05-19 00:35:09 +00:00
Steve Berbary
7080fa2583 [automerger skipped] Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e am: 666a64473b -s ours am: 8dc00cfae4 -s ours am: fb5d27605d -s ours
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 26a7d4bd9e is already in history

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

Change-Id: Ieede0d4113acbd045f30ea5c01fe5f474138757c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 00:01:23 +00:00
Steve Berbary
6430535916 [automerger skipped] Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e am: 666a64473b -s ours am: 8dc00cfae4 -s ours am: fb5d27605d -s ours
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 26a7d4bd9e is already in history

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

Change-Id: I40312afeee86a16cb348324782fa127bce50ddba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 00:00:49 +00:00
Steve Berbary
fb5d27605d [automerger skipped] Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e am: 666a64473b -s ours am: 8dc00cfae4 -s ours
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 26a7d4bd9e is already in history

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

Change-Id: I9ac86a0d9040902c0e40000d1ffca13fb11c098a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:11:43 +00:00
Steve Berbary
8dc00cfae4 [automerger skipped] Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e am: 666a64473b -s ours
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 26a7d4bd9e is already in history

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

Change-Id: I1d7b980ff3cb3b6a36dc2079bdca6ff60ce8c89a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 22:29:41 +00:00
Steve Berbary
666a64473b Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214071

Change-Id: I1f63d2d560b51bfec718dbef8b302b1af0c811c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 21:37:43 +00:00
Steve Berbary
b0733d4f1e Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214071

Change-Id: I792f648ace840368e43c197b6fbb99f745bd03c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 20:48:39 +00:00
Steve Berbary
71dbb01307 Update Security String to 2023-07-01 am: 053ad8aa1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214071

Change-Id: Ic8b2f08177994f51fcc35f13eeb5b2280824fccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 19:59:13 +00:00
Daniel Zheng
b87d46cb1a Merge "Add --max_threads to OTA generation" into udc-dev 2023-05-18 19:53:12 +00:00
Steve Berbary
efe25f78b4 [automerger skipped] Update Security String to 2023-07-01 am: 26a7d4bd9e am: c310efa9f1 am: 470e269362 -s ours am: 7fea641ca0 -s ours
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 d6c119bfaa is already in history

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

Change-Id: Ibc72010566b93bff8a811ae3d35144ec1f83ace7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 11:13:32 +00:00
Steve Berbary
7fea641ca0 [automerger skipped] Update Security String to 2023-07-01 am: 26a7d4bd9e am: c310efa9f1 am: 470e269362 -s ours
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 d6c119bfaa is already in history

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

Change-Id: Iafa4a25f60ce6f2fa6e4fee715fe6c0954afbcbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 10:34:14 +00:00
Steve Berbary
0879ff455e [automerger skipped] Update Security String to 2023-07-01 am: 26a7d4bd9e am: c310efa9f1 am: 70c7201473 -s ours
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 d6c119bfaa is already in history

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

Change-Id: Ic34732b1b6005a1811dc3c0236488346e90d4320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 10:31:05 +00:00
Steve Berbary
470e269362 Update Security String to 2023-07-01 am: 26a7d4bd9e am: c310efa9f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214525

Change-Id: I108c76d795a1f0439c28d251454e6179cf9da9d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 09:32:11 +00:00
Steve Berbary
70c7201473 Update Security String to 2023-07-01 am: 26a7d4bd9e am: c310efa9f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214525

Change-Id: I20f5017a34ac318c8c92ac6c19558eb252273634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 09:31:42 +00:00
Steve Berbary
c310efa9f1 Update Security String to 2023-07-01 am: 26a7d4bd9e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214525

Change-Id: I4ae82a9b16e7c625d33eeca339e012701bb68892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 08:44:46 +00:00
Treehugger Robot
d6286eefa8 Merge "Don't build automatic RROs for tests" into udc-dev 2023-05-17 22:01:57 +00:00
Colin Cross
2e55115ab3 Don't build automatic RROs for tests
Automatic RROs don't make sense for tests, the tests can't rely on
overlays being installed on product or vendor.  Creating the RROs
causes a race during builds that build both droid and device-tests
goals, as the RROs may be installed to the vendor directory as a
dependency of the device-tests goal before or after the vendor image
is packaged as a dependency of the droid goal.  If the RROs are
installed first and the vendor image is low on space it may result
in an out-of-space error.

Bug: 282885159
Test: Rule to build $OUT/vendor/overlay/SystemUITests__*__auto_generated_rro_vendor.apk no longer exists
Ignore-AOSP-First: high priority build fix
Change-Id: I760355ffb1818e91c02a98473312f9f21c149361
2023-05-17 11:01:19 -07:00
Satoshi Futenma
6c8f896589 Support custom payload signer in merge_ota
Add options to handle custom payload signer as it is required in
merge_ota.py as well if the original OTA packages are signed by
the signer.

If input is only one OTA, clone apex_info.pb to the target.

Use common.ZipWriteStr instead of zipfile.writestr, this ensures
that the same permission for the entries as done by
ota_from_target_files.

Bug: 282189563
Test: manual. pass single OTA to merge_ota, with same signing
    parameters as originally used. Confirm that output zip is
    binary identical to input.
(cherry picked from https://android-review.googlesource.com/q/commit:1f93ce20c5a5f3e7c2f6b5e1f9fdc4d2572220cc)
Merged-In: I3b926b8cd69bc74dff6ccf8b5ccc72bedffcac6f
Change-Id: I3b926b8cd69bc74dff6ccf8b5ccc72bedffcac6f
2023-05-17 17:22:51 +00:00
Daniel Zheng
0d3c15c2ae Add --max_threads to OTA generation
Adding an option to configure max number of threads used during
ota_from_target_files

Bug: 277794445
Test: tested ota_from_target_files
(cherry picked from https://android-review.googlesource.com/q/commit:a30989bafa820faf24eca7e11e48f8f122d7991f)
Merged-In: I9bae92ee43c21926434ab04563a2b4f0678b73eb
Change-Id: I9bae92ee43c21926434ab04563a2b4f0678b73eb
this patch is necessary for partner to improve OTA generation b/277794445
2023-05-17 16:14:05 +00:00
SzuWei Lin
0dce348046 Support dynamic 64-bit drmserver
64-bit GSI requires support both 64_32-bit and 64-bit devices at
the same time. Add a new variable TARGET_DYNAMIC_64_32_DRMSERVER
to put drmserver_dynamic.rc into GSI. Which starts 64-bit
drmserver if ro.zygote is zygote64. Otherwise, it keeps the
original behavior to start 32-bit drmserver.

Bug: 282603373
Test: make gsi_arm64-user; Check system/etc/init
Test: make gsi_arm-user; Check systen/etc/init
Change-Id: I874cee00a066086f565e044549ad40c6ab5d62b0
Merged-In: I874cee00a066086f565e044549ad40c6ab5d62b0
2023-05-17 15:35:59 +08:00
Steve Berbary
e4783d4b7a Update Security String to 2023-07-05 am: d6c119bfaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23227854

Change-Id: I32253c6815cc77d3c1a5dea63bde576a8deb900c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 01:21:05 +00:00
Steve Berbary
053ad8aa1b Update Security String to 2023-07-01
Bug: 282371465

Change-Id: I2bb1848e16aff436787a5bf43dbea18012d485a7
Merged-In: I2bb1848e16aff436787a5bf43dbea18012d485a7
2023-05-13 22:26:11 +00:00
Steve Berbary
26a7d4bd9e Update Security String to 2023-07-01
Bug: 282371465

Change-Id: I2bb1848e16aff436787a5bf43dbea18012d485a7
Merged-In: I2bb1848e16aff436787a5bf43dbea18012d485a7
2023-05-13 22:24:28 +00:00
Steve Berbary
d6c119bfaa Update Security String to 2023-07-05
Bug: 282371465
Change-Id: I2bb1848e16aff436787a5bf43dbea18012d485a7
2023-05-13 22:22:23 +00:00
Motomu Utsumi
586720d590 Merge "Use non-next NetworkStack" into udc-dev 2023-05-11 12:37:23 +00:00
Jiakai Zhang
81cd7533c9 Also disable dexpreopt for boot images for unbundled builds.
This fixes the tradefed build error caused by aosp/2582191.

Bug: 280440941
Test: `BUILD_BROKEN_DISABLE_BAZEL=true m dist` on tradefed branch.
(cherry picked from https://android-review.googlesource.com/q/commit:c74a4011e2815f2ffc3815176c958a0fdabbd621)
Merged-In: I34c9fea0a5f7110c9b2bda1986df82afa3eafc79
Change-Id: I34c9fea0a5f7110c9b2bda1986df82afa3eafc79
2023-05-10 18:31:22 +00:00
Motomu Utsumi
f3f48883bc Use non-next NetworkStack
NetworkStack now builds against stable U APIs, so U can use
the stable binaries instead of the "next" versions.

Since it has just been bumped, NetworkStack is equivalent to
NetworkStackNext at this point, so this is a no-op.

Bug: 280250560
Test: m
Ignore-AOSP-First: This CL will be cherry-picked to aosp
Change-Id: I00a9840a69d06c6f4246a2db284c3060392b302b
2023-05-10 17:30:20 +09:00
Jiyong Park
e3f60ee435 Merge "Support to merge PREBUILT_IMAGES" into udc-dev 2023-05-10 00:54:39 +00:00
Po Hu
fc3387bb0e Support to merge PREBUILT_IMAGES
For example, pvmfw.img comes from framework target files package
and dtbo.img comes from vendor target files package.

Bug: 270241811
Test: merge_target_files
Merged-In: If2e6fac5ce3671e3387e801808a195fb7b2c55b5
Change-Id: If2e6fac5ce3671e3387e801808a195fb7b2c55b5
(cherry picked from commit 81c3f4a884)
2023-05-09 08:38:39 +00:00
Shunkai Yao
266bd8aa06 Merge "Removed obsolete audio_effects.conf dependency" into udc-dev 2023-05-09 00:04:06 +00:00
Peiyong Lin
5c5e1b1c0c Merge "Split ANGLE supported and enabled into different Makefiles." into udc-dev 2023-05-05 16:24:26 +00:00
Omar Eissa
ae80a8136b Merge "Exclude apps from initial stopped state allow list" into udc-dev 2023-05-05 13:48:14 +00:00
Shunkai Yao
995cfaeace Removed obsolete audio_effects.conf dependency
Bug: 279987639
Test: presubmit
Ignore-AOSP-First: To avoid merge conflict

Change-Id: Ida71c17e8675878ee406900d805ab0eff2e70acd
2023-05-04 20:52:34 +00:00
Julien Desprez
372c3d6be5 Merge "Revert "Add Traefed Contrib to CATBox"" into udc-dev 2023-05-03 21:16:37 +00:00
Peiyong Lin
3161693a62 Split ANGLE supported and enabled into different Makefiles.
ANGLE binaries should be added to the PRODUCT_PACKAGES instead. This
patch also splits the angle.mk to angle_supported.mk and
angle_default.mk so that when a device just wants to ship ANGLE binaries
to coexist with native GLES drivers, it only needs to inherit the
angle_supported.mk and when a device wants to ship ANGLE as the default
system GLES drivers, it only needs to inherit the angle_default.mk. When
ANGLE is the default system GLES driver, make sure persist.graphics.egl
is defined so that ANGLE is loaded properly.

Bug: 270994705
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I3de4a40b62b39c91c8f6df56d68755830b303f10
Merged-In: I3de4a40b62b39c91c8f6df56d68755830b303f10
2023-05-03 17:20:51 +00:00