Commit Graph

8527 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
f06227d7d2 Merge "Add preinstalled-packages-asl-files.xml to base_system.mk" into udc-dev 2023-04-27 01:11:36 +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
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
Cole Faust
d4b4420a14 Merge "Add filegroup of certificates" 2023-04-04 03:58:15 +00:00
Cole Faust
2d42461400 Move PRODUCT_BRAND to module_common.mk
So that we don't need to specify it in individual mainline modules
products, which becomes more important after the internal ones only
inherit from the common aosp product as opposed to the arch-specific
ones.

Bug: 249685973
Test: Diff'd the soong.variables files for the module_* products and saw no differences
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:211c5c2810e50a1c5d3bca2f1f7942b624fe3abe)
Merged-In: If1733eb193cd3748fb3562d09bfd41651e2480f9
Change-Id: If1733eb193cd3748fb3562d09bfd41651e2480f9
2023-04-03 22:19:00 +00:00
Ulya Trofimovich
72ed6869a4 Merge "Revert "Disable dexpreopt for aosp_riscv64"" am: 1d3c4ae036 am: 86b1dd2b00 am: 33267272ab
Original change: https://android-review.googlesource.com/c/platform/build/+/2511036

Change-Id: Ie54445d1a99fdb569319c3b31a6d6622f8edb0eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 13:08:32 +00:00
Ulya Trofimovich
33267272ab Merge "Revert "Disable dexpreopt for aosp_riscv64"" am: 1d3c4ae036 am: 86b1dd2b00
Original change: https://android-review.googlesource.com/c/platform/build/+/2511036

Change-Id: I76ac0b1cd690b2a019ab0b23bf3b2f01eb6a7fac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 12:37:37 +00:00
Ulya Trofimovich
1d3c4ae036 Merge "Revert "Disable dexpreopt for aosp_riscv64"" 2023-04-03 11:31:42 +00:00
Cole Faust
bf65a62cb9 Add filegroup of certificates
This is needed for bazel to depend on all certificates from a different
package.

Bug: 269577299
Test: See other cl
Change-Id: I4eeb0b892400fa6bd90080c7e10e9fb762d3b7db
2023-04-01 14:48:19 -07:00
Gabriel Biren
3d5b1ba95d Merge "Update generic system makefile to use the AIDL Wifi Vendor HAL." into udc-dev 2023-03-31 01:35:32 +00:00
Gabriel Biren
1669b364b5 Update generic system makefile to use the
AIDL Wifi Vendor HAL.

Bug: 274964641
Test: Pre-submit tests
Ignore-AOSP-First: AIDL HAL is not in AOSP yet.
Change-Id: Id4af079389d5adf8380431da01a1d7f36bb1510d
2023-03-30 21:09:43 +00:00
Jiakai Zhang
068c1285f9 Merge "Turn on ART Service." into udc-dev 2023-03-29 16:21:49 +00:00
Treehugger Robot
5e20b3e0a0 Merge "Retire unused variable" am: b722138c8c am: a94bf766c4 am: 2f25fda8d1
Original change: https://android-review.googlesource.com/c/platform/build/+/2509916

Change-Id: I9c253216842ad9fb7ff64762e4ea81f7f68149bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 20:40:09 +00:00
Treehugger Robot
2f25fda8d1 Merge "Retire unused variable" am: b722138c8c am: a94bf766c4
Original change: https://android-review.googlesource.com/c/platform/build/+/2509916

Change-Id: Ifbd1767c5f51b6ffdb17ee0f4da358a898e74991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 20:10:27 +00:00
Treehugger Robot
b722138c8c Merge "Retire unused variable" 2023-03-28 19:20:52 +00:00
Treehugger Robot
f7a4d3d3fa Merge "Add the system_dlkm partition to goldfish" am: 7f92721184 am: d75d774230 am: c7edde26db
Original change: https://android-review.googlesource.com/c/platform/build/+/2507155

Change-Id: I30164c8e971677afd65d73d6c58a273a19278cf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 17:35:22 +00:00
Treehugger Robot
c7edde26db Merge "Add the system_dlkm partition to goldfish" am: 7f92721184 am: d75d774230
Original change: https://android-review.googlesource.com/c/platform/build/+/2507155

Change-Id: Ifd700dfe1264070522b8201c87733ca7dbd0fa39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 17:05:59 +00:00
Treehugger Robot
7f92721184 Merge "Add the system_dlkm partition to goldfish" 2023-03-28 16:11:02 +00:00
Roman Kiryanov
1b292bf89a Retire unused variable
Bug: 274103438
Test: presubmit
Change-Id: I66deda33e8cf5b4bdd00621ede23bc5ad89b6bbb
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-03-28 08:27:45 -07:00
Ulya Trofimovich
cc5c6a74ee Revert "Disable dexpreopt for aosp_riscv64"
This reverts commit ae7f543b7c.

Reason for revert: Enabling dexpreopt for RISC-V (there is still no
  compiler support, but dex2oat runs in verification mode and does
  not attempt any compilation with https://r.android.com/2510739).

Change-Id: I0a6d0416bec51131f0a54c7ff5b0e194728452b1
2023-03-28 13:15:35 +00:00
Pascal Mütschard
cc5078aba8 Merge "Adds the gpu_counter_producer command." into udc-dev 2023-03-28 12:08:08 +00:00