Commit Graph

37104 Commits

Author SHA1 Message Date
Pawan Wagh
cc1dd590fd Merge "Fix dependency of system img on boot_otas" into main 2024-04-29 22:22:17 +00:00
Pawan Wagh
bd2d79d311 Fix dependency of system img on boot_otas
If BOARD_16K_OTA_MOVE_VENDOR := true is set BoardConfig,
there is still dependency of system img on boot otas as it is system ota
paths are being added in default installed modules. Add vendor paths
whenever move vendor is set.

Bug: 335022191
Test: m
Change-Id: I19b41e5b9ade50f3cabf43995af36e66e09c6acf
2024-04-29 19:48:26 +00:00
Wei Li
013330b028 Merge "Add license metadata declarations which are moved from device/google/raviole/Android.mk." into main 2024-04-29 18:19:12 +00:00
Treehugger Robot
0da2fee848 Merge "Revert "Drop cmdgoals special case from prebuilt selection"" into main 2024-04-27 00:23:56 +00:00
Spandan Das
4049cdb23a Revert "Drop cmdgoals special case from prebuilt selection"
This reverts commit e18b9fee63.

Reason for revert: Likely causing build failures for go/ab/git_aosp-main-with-phones

Change-Id: If01f58908bd66c7afa42b9c96d048dfcd2d70812
2024-04-26 23:08:10 +00:00
Treehugger Robot
8e7c645476 Merge "Drop cmdgoals special case from prebuilt selection" into main 2024-04-26 22:49:14 +00:00
Spandan Das
e18b9fee63 Drop cmdgoals special case from prebuilt selection
Before trunk stable, this check ensured that `docs` and `sdk` builds
contained all the apis provided by an apex. If source apex was used, it
would use the source java_sdk_library. If prebuilt apex was used, it
would use the prebuilt java_sdk_library.

After trunk stable, all release configurations for platform development
use the everything stubs of source java_sdk_library for javac, and
exportable stubs of source java_sdk_library for sdk/docs. The exportable
stubs is aware of the enabled flags for a specific release
configuration.

Since sdk and docs builds use the exportable stubs, we can drop this
special case to use the prebuilt stubs/srcjar files.

Test: presubmits
Test: in internal, lunch cf_x86_64_phone-next-userdebug (currently uses
bt prebuilts)
Test: m docs
Test: aninja -t path docs
out/soong/.intermediates/packages/modules/Bluetooth/framework/framework-bluetooth.stubs.source/android_common/exportable/framework-bluetooth.stubs.source-stubs.srcjar;
still exists after this cl

Bug: 308188056

Change-Id: I65da9f25634f0e8c3d514a4c175f89c3e5eb9712
2024-04-26 20:50:50 +00:00
Spandan Das
b951161773 Merge "Make system_server.zip compatible with prebuilt apex builds" into main 2024-04-26 19:47:16 +00:00
Wei Li
4d1491db47 Add license metadata declarations which are moved from device/google/raviole/Android.mk.
Bug: 311522698
Test: CIs
Change-Id: I3350590e626f1d6ffe1767e0c6d39384b63d7ad8
2024-04-26 12:24:35 -07:00
Spandan Das
d22b1390b9 Make system_server.zip compatible with prebuilt apex builds
This artifact contains the system server jars that were used in the
build. At ToT, this was disabled when prebuilts were enabled to prevent
version skew between the system server jars built from source, and the
system server jars deapexed from the prebuilt apex that was installed
into the system image.

With this CL, this artifact is now compatible with prebuilts. If a
google prebuilt apex is used, system_server.zip will contain the .jar
deapexed from that prebuilt. e.g. if art _and_ btservices prebuilts are
enabled, then system_server.zip will contain the prebuilt jars for those
apexes, and sources for others.

This implementation leverages the fact that soong copies the _selected_
system server jars to out/soong/system_server_dexjars for dex2oat. Soong
is aware of source/prebuilts, and populates this directory with the
correct system server jar.

One side effect of this change is that affects the directory structure
of the zip. Previously, service-art.jar will be present in the zip file
at apex/com.android.art/java/service-art.jar. After this change
service-art.jar will be present in the top-level directory of the zip

Bug: 308188056
Test: the zip is not bit-identical, but I checked that the file contents are indentical (discussed below)
Test: unzip out/target/product/vsoc_x86_64/system_server.zip.before -d system_server.before
Test: unzip out/target/product/vsoc_x86_64/system_server.zip.before -d system_server.after
Test: find system_server.before/ -type f -printf '%s\t%p\n' | sort -n | cut -f2- | xargs cat | shasum
Test: find system_server.after/ -type f -printf '%s\t%p\n' | sort -n | cut -f2- | xargs cat | shasum
Test: the shasums are identical

Test: in internal, lunch cf_x86_64_phone-next-userdebug (next uses bt
prebuilts)
Test: m nothing
Test: aninja -t path out/target/product/vsoc_x86_64/system_server.zip <vendor_dir_path>/BluetoothGooglePrebuilt/com.google.android.btservices.apks; path exists

Change-Id: I213150b7ee2b012fd649b308f3c72bebf5ca7bf8
2024-04-26 16:43:52 +00:00
Ben Fennema
f089d9a587 Allow setting --boot_variable_file in build-ota-package-target
For ota generation via build-ota-package-target, match how
--oem_settings works, but for --boot_variable_file.

Bug: 335732867
Test: Set BOOT_VAR_OTA_CONFIG, make dist, and check ota_metadata
Change-Id: I526e2b280eb288f3abaace2a5daac97a0f7ac6d7
2024-04-26 08:38:08 -07:00
Wei Li
671bb0bd4a Add license metadata declarations which are moved from device/google/gs101/Android.mk.
Bug: 310058310
Test: CIs
Change-Id: Ie49bce281879ed49482a9a43791b3839328348fa
2024-04-25 11:54:00 -07:00
Wei Li
5deb660e32 Merge "Add license metadata declarations which are moved from device/google/coral/Android.mk." into main 2024-04-25 07:15:52 +00:00
Treehugger Robot
83f8fb1643 Merge "Add appcompat system properties flag to soong" into main 2024-04-24 22:35:37 +00:00
Treehugger Robot
b2050366ef Merge "Allow specifying load order for 16K kernel modules" into main 2024-04-24 22:07:34 +00:00
Wei Li
8edc560eda Add license metadata declarations which are moved from device/google/coral/Android.mk.
Bug: 336592724
Test: CIs
Change-Id: Ifa586648ec2d25cc4f122ad84894e21fc8acebe5
2024-04-24 19:36:23 +00:00
Treehugger Robot
7123699d09 Merge "Drop INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES" into main 2024-04-24 01:30:43 +00:00
Spandan Das
8ec0862bdd Drop INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES
This list is used to create soong config namespaces per toggle-able
module, and set source_build property. internal and partner branches now
use RELEASE_APEX_CONTRIBUTIONS_* for source vs selection, so remove this
mechanism to prevent confusing behaviors when these two mechanisms have
conflicting values.

`art_module.source_build` is a special-case which uses an additional variable
`ART_MODULE_SOURCE_BUILD`. This will be tracked in
https://r.android.com/3037396

Bug: 308188056
Test: presubmits
Test: downloaded this CL in v-aml branch, m
out/soong/prebuilt_info.json; file is identical

Merged-In: I3f9cbb24d6f3a7a0312683906826708147f469ee
Change-Id: I3f9cbb24d6f3a7a0312683906826708147f469ee
2024-04-24 00:44:59 +00:00
Nikita Ioffe
ed8bd8aaf4 Add PRODUCT_AVF_MICRODROID_GUEST_GKI_VERSION to _product_single_value_vars
Forgot to add it in aosp/3044155.

Bug: 325991735
Test: m
Change-Id: I21d08b85b25426e498fc90c90729f7cb01f1f9d1
2024-04-23 18:34:52 +00:00
Treehugger Robot
96407369b1 Merge "Add soong config variables for selinux" into main 2024-04-23 01:14:44 +00:00
Wei Li
7f2b0fe594 Merge "Add license metadata declarations." into main 2024-04-22 22:52:37 +00:00
William McVicker
adc3664dd2 Merge "Add new product property to detect if PAGE_SIZE is defined" into main 2024-04-22 18:30:04 +00:00
Kelvin Zhang
980aded04f Allow specifying load order for 16K kernel modules
Test: th
Bug: 293313353
Change-Id: Iffd5f064973fc9a2503f2fde32bc1c6d548d9c33
2024-04-19 20:35:34 -07:00
Nate Myren
eed5dcf31e Add appcompat system properties flag to soong
Bug: 331307495
Test: m
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7e5f93f3cccdc38a25e6b9304752f0b2f7f8b0b9)
Merged-In: I554c499f6239e62c33640a81d9da73545fc7631b
Change-Id: I554c499f6239e62c33640a81d9da73545fc7631b
2024-04-19 19:07:40 +00:00
Paul Duffin
56ac6da961 Use new metalava jar-to-diff command
Replaces the use of `--input-jar-file` and `--api-xml` with the newly
added `jar-to-diff` command.

Test: TARGETS=$(for i in api.xml system-api.xml module-lib-api.xml system-server-api.xml test-api.xml; do echo out/target/common/obj/$i; done)
      m $TARGETS
      # Diff $TARGETS with and without this change to make sure that
      # they are identical, which they are.
Change-Id: I6a78febb4b2e4d06a0b3aea29fb4a7f94c9ab9a4
2024-04-19 12:34:47 +01:00
Jim Tang
ccd1f73c5f Merge "Deprecate USE_PREBUILT_SDK_TOOLS_IN_PLACE" into main 2024-04-19 00:47:08 +00:00
Daniel Zheng
b24b46d43f Merge "add build property for compression_factor" into main 2024-04-18 20:59:40 +00:00
Nikita Ioffe
d0d74d2038 Merge "Propagate PRODUCT_AVF_MICRODROID_GUEST_GKI_VERSION to soong" into main 2024-04-18 20:03:53 +00:00
Daniel Zheng
270130a025 add build property for compression_factor
Compression factor, as discussed, should be a configurable build
property. This flag here will control that. From initial analysis, it
looks like 64k is a good default. go/variable-block-vabc-perf

Bug: 313962438
Test: th
Change-Id: I2bddede22655e36446e734ac1917be560b1a3a1b
2024-04-18 11:22:26 -07:00
Daniel Zheng
78986f598f Merge "Revert^2 "Turn on V3 cow"" into main 2024-04-18 16:54:15 +00:00
Jim Tang
b9cc101bca Deprecate USE_PREBUILT_SDK_TOOLS_IN_PLACE
USE_PREBUILT_SDK_TOOLS_IN_PLACE is not set anywhere else after
aosp/3043552 lands.

Bug: 122333025
Bug: 332464939
Test: m
Change-Id: I55490cdc0a7036263876ecbb322cc5b4af8d1959
2024-04-18 14:12:15 +08:00
Vilas Bhat
185a3fc892 Merge "16k: build: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets" into main 2024-04-17 20:27:37 +00:00
Treehugger Robot
9194b690b1 Merge "Add dependencies for module which define LOCAL_SOONG_INSTALL_PAIRS" into main 2024-04-17 09:43:53 +00:00
Nikita Ioffe
fff0d2d02f Propagate PRODUCT_AVF_MICRODROID_GUEST_GKI_VERSION to soong
Bug: 329383978
Test: m
Change-Id: Ie955058379c1aa00c90b42e348f8b270a0719c8a
2024-04-16 23:28:40 +00:00
T.J. Mercier
70533992f4 Merge "Add flags for cgroup v2 and memcg v2 features" into main 2024-04-16 21:40:38 +00:00
Daniel Zheng
4023fdfc04 Revert^2 "Turn on V3 cow"
This reverts commit fa5bfb9d79.

Reason for revert: we were running into OTA failures b/333966507. The reason was that OTA compatibility tools on go/absign weren't updated with our v3 compatibility tools (which turns of v3 full OTA for devices launching prior to Android 15). Once we know that go/absign is updated, we can check in this change again

Change-Id: I789c24b57754d6ede794d7f9451ee0ca469c2fb4
2024-04-16 15:46:11 +00:00
Linus Tufvesson
984b069ce2 Use flag for min supported target sdk
Test: Build and flash
Test: adb shell getprop ro.build.version.min_supported_target_sdk
Bug: 297603927
Change-Id: I3a2bcad6b001364a2cf35cad1cac7f69185169d0
2024-04-16 08:08:49 +00:00
yangbill
c3f2c7038c Add dependencies for module which define LOCAL_SOONG_INSTALL_PAIRS
The original behvaior will not install related files define in
LOCAL_SOONG_INSTALL_PAIRS due to there's no dependency information in
make, this CL parse the string from each LOCAL_SOONG_INSTALL_PAIRS after
':' as dependencies.

Bug: 333974089
Test: apply aosp/3041672 ; m hyph-lic

Change-Id: I79050e99c3e63f58cfd32db270c909a76bd96801
2024-04-16 04:50:50 +00:00
Wei Li
6b5caf0f7f Add license metadata declarations.
They are moved from:
- device/generic/car/Android.mk
- device/generic/trusty/Android.mk
- device/generic/uml/Android.mk
- device/google_car/common/Android.mk
- device/google/atv/Android.mk

With this CL the Android.mk files can be deleted.

Bug: 309884347
Test: CIs
Change-Id: I8c27c1add6c27eb8d651779f39bb4d951acaf613
2024-04-15 22:28:39 +00:00
Vilas Bhat
f44951d3af 16k: build: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets
This relands commit 35839ec1a3 and also
includes `PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO` override for several
targets. The latter is required in order to fix failing tests due to
mismatch in the `VSR_VENDOR_API_LEVEL` value between test and device
targets.

Bug: 333124272
Bug: 310232825
Change-Id: I12db4b78b02aa4a58c7355852dc2ff5ae395592c
2024-04-15 21:45:08 +00:00
Treehugger Robot
a40c6380a1 Merge "Revert^2 "Expose RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES"" into main 2024-04-15 12:06:31 +00:00
Treehugger Robot
5fcfa8a3c2 Merge "Revert^3 "16k: core: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets"" into main 2024-04-15 05:39:12 +00:00
Daniel Zheng
28ca2fc0a0 Merge "Revert "Turn on V3 cow"" into main 2024-04-13 06:50:00 +00:00
Daniel Zheng
fa5bfb9d79 Revert "Turn on V3 cow"
Revert submission 2973761-cow_v3_make

Reason for revert: b/333966507

Reverted changes: /q/submissionid:2973761-cow_v3_make

Change-Id: I4f8c19a1d78b9af882e7df51fb2fc0172c0282c3
2024-04-12 22:24:42 +00:00
Vilas Bhat
15e3467d6d Revert^3 "16k: core: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets"
This reverts commit 35839ec1a3.

Reason for revert: CI breakages for 2 targets. Please refer to bug for more details

Bug: 334152807
Change-Id: I0e38583cd3fa57afef432406374ec8d4ddc57e72
2024-04-12 22:20:40 +00:00
Vilas Bhat
d3123d4f62 16k: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO only on Android V targets
This updates the VSR_VENDOR_API_LEVEL for which
TARGET_NO_BIONIC_PAGE_SIZE_MACRO is set to false from < 34 to < 35

Bug: 310232825
Test: lunch <target> && get_build_var TARGET_NO_BIONIC_PAGE_SIZE_MACRO
Change-Id: Ib6b8ba94fe6b2c8b7bbf31fb56e07bd97eb79fc2
2024-04-12 17:23:57 +00:00
Vilas Bhat
eaf40e1675 Merge "Revert^2 "16k: core: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets"" into main 2024-04-12 17:18:48 +00:00
Jeongik Cha
84b485a456 Revert^2 "Expose RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES"
This reverts commit 5d09b51ba9.

Reason for revert: relanding

Change-Id: I537ec04c5c89c8d0d8abeb17f0c2c9cb13a3cfae
2024-04-12 09:00:37 +00:00
Treehugger Robot
79acb6516c Merge "Revert "Expose RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES"" into main 2024-04-12 07:46:26 +00:00
Juyu Chen
5d09b51ba9 Revert "Expose RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES"
This reverts commit 7cefe70a00.

Reason for revert: <
Satish Yalla, 8 min
Hi @Juyu Chen
could you please create a revert for this CL https://android-review.git.corp.google.com/c/platform/build/+/3033593
suspecting culprit for b/333859398
Thanks!
>

Change-Id: I35e3313a5e9bc751430ab0fc39c3c07b0a50cb7b
2024-04-12 05:56:15 +00:00