Commit Graph

8595 Commits

Author SHA1 Message Date
Richard Xie
02b9b9e194 Revert "Remove emulator dependencies on non emulator targets (2)"
Revert submission 2529481-aosp-no-emulator

Reason for revert: DroidMonitor: Potential culprit for Bug 280642806 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:2529481-aosp-no-emulator

Change-Id: I732e1b1a1f001fe016a4e20c1a95516995522501
2023-05-03 20:56:54 +00:00
Roman Kiryanov
7ac563dd0f Merge "Remove emulator dependencies on non emulator targets (2)" am: f50711adc4 am: 25a8079ca2 am: f6c36893c0
Original change: https://android-review.googlesource.com/c/platform/build/+/2529481

Change-Id: Ie7b039a82424519c53a38b0f512f40f3157ba570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 19:39:22 +00:00
Roman Kiryanov
25a8079ca2 Merge "Remove emulator dependencies on non emulator targets (2)" am: f50711adc4
Original change: https://android-review.googlesource.com/c/platform/build/+/2529481

Change-Id: I751e69130a3ab96210cba37e51959edd6e0c44cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 18:02:38 +00:00
Roman Kiryanov
f50711adc4 Merge "Remove emulator dependencies on non emulator targets (2)" 2023-05-03 17:28:12 +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
Peiyong Lin
20d1b668db 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
2023-05-03 16:44:26 +00:00
Treehugger Robot
b981ba578c Merge "Remove config for 64-bit binder ABI" am: 8844e4f145 am: 03ceb1b56e am: be7574828c
Original change: https://android-review.googlesource.com/c/platform/build/+/2553826

Change-Id: Ia0c75f07b9ac519460a05ae00b2de9a73f8abc6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 00:09:38 +00:00
Treehugger Robot
03ceb1b56e Merge "Remove config for 64-bit binder ABI" am: 8844e4f145
Original change: https://android-review.googlesource.com/c/platform/build/+/2553826

Change-Id: If2ef5b329f9e246b50c1a2188a45f87677646e57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 22:16:16 +00:00
Treehugger Robot
8844e4f145 Merge "Remove config for 64-bit binder ABI" 2023-05-01 21:32:30 +00:00
Omar Eissa
4c9153bae0 Exclude apps from initial stopped state allow list
Exclude apps that we have high confidence that force stopping them
wouldn't be an issue given that they don't need to start until the user
interacts with them.

Bug: 269129704
Test: Manual
Ignore-AOSP-First: Merge conflict from AOSP to internal master (and this needs to go to UDC, als)
Change-Id: I363fbd4d899aed6772199b05fa763be3fa5f31b6
2023-04-28 14:57:03 +00:00
Peiyong Lin
6871bbf91e Properly define angle.mk
Previously we used USE_ANGLE to determine whether the build should include
ANGLE drivers, this patch consolidates that into a separate Makefile.

Bug: b/270994705
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I4d7ffb869ced219009446d907230178e4b940157
Merged-In: I4d7ffb869ced219009446d907230178e4b940157
2023-04-27 22:36:36 +00:00
Peiyong Lin
eda45ee725 Merge "Properly define angle.mk" am: c4c3462f2b am: 8c97799f15 am: 8f70890d10
Original change: https://android-review.googlesource.com/c/platform/build/+/2563813

Change-Id: Ia8e2dbf5f1ed5b549bcb1ad53fd57c3bb0ab9e85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 21:16:16 +00:00
Peiyong Lin
8c97799f15 Merge "Properly define angle.mk" am: c4c3462f2b
Original change: https://android-review.googlesource.com/c/platform/build/+/2563813

Change-Id: Ie14484a2aaa545670e9e895aaf7d8c2b4d1daa6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 20:26:15 +00:00
Martijn Coenen
49697f175b Merge "Add initial stopped state packages for AOSP products." into udc-dev am: 2467b20cec
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22427126

Change-Id: I66c458c557d68b86afd9198970c20ac1f10c5c7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 17:05:41 +00:00
Martijn Coenen
2467b20cec Merge "Add initial stopped state packages for AOSP products." into udc-dev 2023-04-27 16:35:34 +00:00
William Loh
783b64d809 Merge "Add preinstalled-packages-asl-files.xml to base_system.mk" into udc-dev am: f06227d7d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22894896

Change-Id: Ib9a75351092bc2b18383dbef2ccff01e02dbb6a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 01:56:23 +00:00
William Loh
f06227d7d2 Merge "Add preinstalled-packages-asl-files.xml to base_system.mk" into udc-dev 2023-04-27 01:11:36 +00:00
Peiyong Lin
148276b55a Properly define angle.mk
Previously we used USE_ANGLE to determine whether the build should include
ANGLE drivers, this patch consolidates that into a separate Makefile.

Bug: b/270994705
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I4d7ffb869ced219009446d907230178e4b940157
2023-04-26 22:05:20 +00:00
Steven Moreland
52fbc7df01 Remove config for 64-bit binder ABI
Also make it an error to specify the configuration
being removed.

Bug: 232423610
Test: build, boot
Change-Id: I1e4d993c7f4b9628eee6b270e47919aede4408b6
2023-04-26 20:45:15 +00:00
Martijn Coenen
8a1cdb8e95 Add initial stopped state packages for AOSP products.
AOSP starts with all apps exempt from the stopped state; apps without a
launcher entry aren't stopped by default, and all AOSP apps that do have
a launcher entry are contained in this sysconfig.

Bug: 269129704
Test: Manually inspect
Ignore-AOSP-First: Merge conflict from AOSP to internal master (and this needs to go to UDC, als)
Change-Id: I752f986a210621510f694b3f62bb5c6151db55d6
2023-04-26 19:33:39 +00:00
William Loh
a3e0f4eed3 Add preinstalled-packages-asl-files.xml to base_system.mk
Bug: 276979041
Test: None
Change-Id: I8165f2c33245ef5e652a9fb3dc93711f518dd079
2023-04-26 10:50:49 -07:00
Pranav Gupta
33376577bf Remove MODULE_BUILD_FROM_SOURCE for gsi_release.mk
The gsi_release.mk should be agnostic of AOSP or Android. In case of
Android builds, modules should be prebuilt, however in the case of AOSP
they can be built from source. This option should now be configured at
the product makefile level

Also update the shipping API to 34

Bug: 278607630

Test: TARGET_PRODUCT=gsi_arm64 TARGET_BUILD_VARIANT=userdebug build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
returns true
TARGET_PRODUCT=gsi_arm64 TARGET_BUILD_VARIANT=userdebug MODULE_BUILD_FROM_SOURCE=false build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
returns false
(cherry picked from https://android-review.googlesource.com/q/commit:105610bdf04b12404026e3b52f272688099eda93)
Merged-In: I5937764d8df307ed7547363e6ba2742828779282
Change-Id: I5937764d8df307ed7547363e6ba2742828779282
2023-04-25 00:16:16 +00:00
Treehugger Robot
058e4b2c16 Merge "Set BOARD_X_FILE_SYSTEM_TYPE in the common BoardConfig file" am: d88d79989d am: 34ff715849 am: 33f984ffb4
Original change: https://android-review.googlesource.com/c/platform/build/+/2551676

Change-Id: Ia67e8cfee38a1e9e5d2ca24b99318e65061cee32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 18:27:09 +00:00
Treehugger Robot
34ff715849 Merge "Set BOARD_X_FILE_SYSTEM_TYPE in the common BoardConfig file" am: d88d79989d
Original change: https://android-review.googlesource.com/c/platform/build/+/2551676

Change-Id: Ic0850dc696ffac73aea5667dfc76a3e15f423cd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 16:47:25 +00:00
Treehugger Robot
d88d79989d Merge "Set BOARD_X_FILE_SYSTEM_TYPE in the common BoardConfig file" 2023-04-24 15:55:24 +00:00
Treehugger Robot
b644671ee7 Merge "Remove MODULE_BUILD_FROM_SOURCE for gsi_release.mk" am: 4a9b9b4d89 am: 59d4bb4a86 am: 959530c9e3
Original change: https://android-review.googlesource.com/c/platform/build/+/2546591

Change-Id: Ibe29735560d2099e5724bda0a4b6ba4b9273cfcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 15:26:05 +00:00
Treehugger Robot
59d4bb4a86 Merge "Remove MODULE_BUILD_FROM_SOURCE for gsi_release.mk" am: 4a9b9b4d89
Original change: https://android-review.googlesource.com/c/platform/build/+/2546591

Change-Id: Iae5c9827880227c5fe2a128050d5410665241f52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 13:51:27 +00:00
Roman Kiryanov
d82931f9aa Remove emulator dependencies on non emulator targets (2)
Bug: 111538404
Test: presubmit
Change-Id: Idd55d7f10bc178cfe716d173dbe59d2bed5fd963
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-04-22 18:07:52 -07:00
Roman Kiryanov
2d9385fd32 Set BOARD_X_FILE_SYSTEM_TYPE in the common BoardConfig file
required if TARGET_COPY_OUT_X is set to
`product` or `system_ext`.

Bug: 111538404
Test: presubmit
Change-Id: Ibe7538885cd2f00b8f4340db83be7618a0beee4a
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-04-22 18:07:30 -07:00
Xin Li
d6b6d0102a Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994
Bug: 275386652
Merged-In: I4b2ea3956c34aa56cc6f54bab7148f116c34759e
Change-Id: I900022a8e8f104b6dc52745211c428601be53ba6
2023-04-21 09:49:08 -07:00
Pranav Gupta
105610bdf0 Remove MODULE_BUILD_FROM_SOURCE for gsi_release.mk
The gsi_release.mk should be agnostic of AOSP or Android. In case of
Android builds, modules should be prebuilt, however in the case of AOSP
they can be built from source. This option should now be configured at
the product makefile level

Also update the shipping API to 34

Bug: 278607630

Test: TARGET_PRODUCT=gsi_arm64 TARGET_BUILD_VARIANT=userdebug build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
returns true
TARGET_PRODUCT=gsi_arm64 TARGET_BUILD_VARIANT=userdebug MODULE_BUILD_FROM_SOURCE=false build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
returns false

Change-Id: I5937764d8df307ed7547363e6ba2742828779282
2023-04-20 19:23:35 +00:00
Roman Kiryanov
b645272f3c Merge "Cleanup in emulator_arm64/device.mk" am: aa1f970711 am: 40e233c6ba am: 8c82f8e5c1
Original change: https://android-review.googlesource.com/c/platform/build/+/2548555

Change-Id: I00ce7a8263d7e8e704acfbbceeed9efb1591cf6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 08:00:22 +00:00
Roman Kiryanov
8c82f8e5c1 Merge "Cleanup in emulator_arm64/device.mk" am: aa1f970711 am: 40e233c6ba
Original change: https://android-review.googlesource.com/c/platform/build/+/2548555

Change-Id: I5835f177be5be2e139758c083d05df46872c66dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 07:17:54 +00:00
Roman Kiryanov
b623cfbe96 Cleanup in emulator_arm64/device.mk
emulator specifies its kernel in device/generic/goldfish

Bug: 111538404
Test: presubmit
Change-Id: I76ab7e5fbb19805f52c2ca4713e11cc544ada905
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-04-19 13:30:46 -07:00
Florian Mayer
074dce314c Merge "Include hwasan lib and runtime on arm64 system images" am: ed97847d9a am: b98ff26c7d am: aca0515f1b
Original change: https://android-review.googlesource.com/c/platform/build/+/2526599

Change-Id: Ibd295e9a35a9494fae156090330274173cecab14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 00:42:08 +00:00
Florian Mayer
aca0515f1b Merge "Include hwasan lib and runtime on arm64 system images" am: ed97847d9a am: b98ff26c7d
Original change: https://android-review.googlesource.com/c/platform/build/+/2526599

Change-Id: I4ea6e13d7297e5b6546475bd55428c1bec6a5fbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 23:55:55 +00:00
Florian Mayer
ed97847d9a Merge "Include hwasan lib and runtime on arm64 system images" 2023-04-14 23:27:56 +00:00
Florian Mayer
201eb3b6cc Include hwasan lib and runtime on arm64 system images
This is needed so we can run hwasan-enabled apps for debugging on normal
system images.

Bug: 276930343
Change-Id: Ie572d77307e5e6268b851ea5c96aae05d588dae3
2023-04-13 17:39:25 -07:00
Treehugger Robot
e562055a3f Merge "Remove emulator dependencies on non emulator targets (1)" am: 2782b82d01 am: 825ec3ea87 am: 8bf7d62a34
Original change: https://android-review.googlesource.com/c/platform/build/+/2513876

Change-Id: Idfaecac2754edbbb90f276d561f122e7508986f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 21:00:08 +00:00
Treehugger Robot
8bf7d62a34 Merge "Remove emulator dependencies on non emulator targets (1)" am: 2782b82d01 am: 825ec3ea87
Original change: https://android-review.googlesource.com/c/platform/build/+/2513876

Change-Id: I0e856b35ccaa0f175e3990ca28309fe97947b8a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 20:27:56 +00:00
Roman Kiryanov
52b797e741 Remove emulator dependencies on non emulator targets (1)
Bug: 266607613
Bug: 111538404
Test: presubmit
Change-Id: I2c8870d68696f39277a503081c91274b0e9ec1bd
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-04-10 10:53:25 -07:00
Alex Buynytskyy
e7dc4736dc UpsideDownCake is now 34
Ignore-AOSP-First: UpsideDownCake Finalization
Bug: 275409981
Test: build
Change-Id: I956555f9e767cca52a410536a9cd832e9f7a0f05
2023-04-09 15:13:20 +00:00
Treehugger Robot
eb081b1f23 Merge "Make android_certificate_directory public" am: 42bc8b9809 am: f2188a7994 am: 2ce394b862
Original change: https://android-review.googlesource.com/c/platform/build/+/2523277

Change-Id: I102647695618c21ded0c6e694e289bd2c7fef0ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 21:33:59 +00:00
Treehugger Robot
2ce394b862 Merge "Make android_certificate_directory public" am: 42bc8b9809 am: f2188a7994
Original change: https://android-review.googlesource.com/c/platform/build/+/2523277

Change-Id: I00951f29562d13a8fda6a97df96a00232978967a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 21:04:12 +00:00
Cole Faust
b51e1ffce4 Make android_certificate_directory public
This should not be necessary because bp2build should emit a package()
statement with default_visibility = public. However, there appears
to be a problem with bp2build's symlink forest, where it doesn't
handle symlinks correctly.

build/target is a symlink to build/make/target, but in the symlink
forest, build/target is a symlink to the source dir's build/target
instead of to the symlink forest's build/make/target. This means
that when reading this build file via the build/target symlink,
you won't get the bp2build-provided default visibility. (or any other
bp2build generated targets)

We should send a proper fix for this, but in the meantime submit this
quick fix to resolve some failing builds.

Bug: 269577299
Test: lunch bertha_x86_64-userdebug, m nothing
Change-Id: Ia45c7f4a0655b1364b735d6eccf25cad70cad134
2023-04-04 14:09:27 -07:00
Treehugger Robot
645959d878 Merge "Move PRODUCT_BRAND to module_common.mk" am: 70c0c6eb81 am: 4091559a4a am: 7894336346
Original change: https://android-review.googlesource.com/c/platform/build/+/2521235

Change-Id: I5e4fe1300d0a1071fc144cf4693d13fe419cc271
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 08:26:19 +00:00
Treehugger Robot
7894336346 Merge "Move PRODUCT_BRAND to module_common.mk" am: 70c0c6eb81 am: 4091559a4a
Original change: https://android-review.googlesource.com/c/platform/build/+/2521235

Change-Id: I0cd8f53371f9fee16e1ede1b46cd55726825fb03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 07:57:35 +00:00
Treehugger Robot
70c0c6eb81 Merge "Move PRODUCT_BRAND to module_common.mk" 2023-04-04 07:11:11 +00:00
Cole Faust
0fb15ff3b5 Merge "Add filegroup of certificates" am: d4b4420a14 am: 758b5f0ec1 am: f8dfc30a5f
Original change: https://android-review.googlesource.com/c/platform/build/+/2518216

Change-Id: I002891e2458ea08d22d39912a06266ac856daf64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 05:26:44 +00:00
Cole Faust
f8dfc30a5f Merge "Add filegroup of certificates" am: d4b4420a14 am: 758b5f0ec1
Original change: https://android-review.googlesource.com/c/platform/build/+/2518216

Change-Id: I7131ed35efe0634b4e28fb4a2c8edeb95d2c12b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 04:55:03 +00:00