Commit Graph

37143 Commits

Author SHA1 Message Date
Treehugger Robot
151043cc08 Merge "Drop cmdgoals special case from prebuilt selection" into main am: 8e7c645476
Original change: https://android-review.googlesource.com/c/platform/build/+/3063044

Change-Id: I4482f8bca3a270a1a7145be91e27904c95f4a690
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 23:14:35 +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
5d933686d3 Merge "Make system_server.zip compatible with prebuilt apex builds" into main am: b951161773
Original change: https://android-review.googlesource.com/c/platform/build/+/3062109

Change-Id: I87f03670246404f0ee68d2eb14749f7e67f70ec0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 19:53:20 +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
Ben Fennema
0d3917068f Merge "Allow setting --boot_variable_file in build-ota-package-target" into main am: 5e6df98fc3
Original change: https://android-review.googlesource.com/c/platform/build/+/3063013

Change-Id: If0ce27e09076510c76edd6f6d9e745be35478971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 17:17:21 +00: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
b59a63495f Merge "Add license metadata declarations which are moved from device/google/gs101/Android.mk." into main am: 68d63d47af
Original change: https://android-review.googlesource.com/c/platform/build/+/3062144

Change-Id: I5ac84cc18b500b7f427a2a283cd6e58e60dc72c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 01:57:24 +00: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
95fdefa267 Merge "Add license metadata declarations which are moved from device/google/coral/Android.mk." into main am: 5deb660e32
Original change: https://android-review.googlesource.com/c/platform/build/+/3056782

Change-Id: Ifff8be79241c1cf857511980c424e983a44a7f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-25 07:42:03 +00: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
281378018e Merge "Add appcompat system properties flag to soong" into main am: 83f8fb1643
Original change: https://android-review.googlesource.com/c/platform/build/+/3047844

Change-Id: I872deb1ca447aafd7ab934447b4fdb74609c0af2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-24 22:52:41 +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
297fe4d2df Merge "Allow specifying load order for 16K kernel modules" into main am: b2050366ef
Original change: https://android-review.googlesource.com/c/platform/build/+/3050028

Change-Id: Ifbde8c97d300f74185e80e69391ac1f908f2e9d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-24 22:21:54 +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
448e4f7566 Merge "Drop INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES" into main am: 7123699d09
Original change: https://android-review.googlesource.com/c/platform/build/+/3056785

Change-Id: I478ff7682deff7117e8f20a57e104b21ec126e21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-24 01:47:26 +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
3fab32c79e Merge "Add PRODUCT_AVF_MICRODROID_GUEST_GKI_VERSION to _product_single_value_vars" into main am: 496a329bd0
Original change: https://android-review.googlesource.com/c/platform/build/+/3056302

Change-Id: I18b534967d6aadce5632e8104786c1a54d85c5ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-23 22:32:12 +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
058c252a72 Merge "Add soong config variables for selinux" into main am: 96407369b1
Original change: https://android-review.googlesource.com/c/platform/build/+/3027444

Change-Id: Ic5099a78c54743ac5864f95855a3ac2b24b6d3a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-23 01:34:26 +00:00
Treehugger Robot
96407369b1 Merge "Add soong config variables for selinux" into main 2024-04-23 01:14:44 +00:00
Wei Li
ad5198bdef Merge "Add license metadata declarations." into main am: 7f2b0fe594
Original change: https://android-review.googlesource.com/c/platform/build/+/3042952

Change-Id: Ie25d1641a515669895b187cfedb2478a1564bde5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 23:10:29 +00:00
Wei Li
7f2b0fe594 Merge "Add license metadata declarations." into main 2024-04-22 22:52:37 +00:00
William McVicker
adae533720 Merge "Add new product property to detect if PAGE_SIZE is defined" into main am: adc3664dd2
Original change: https://android-review.googlesource.com/c/platform/build/+/2871084

Change-Id: Ie695e2113ab7044b157adb2b6dba34262f7f49c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 18:58:19 +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
Paul Duffin
8709e9a23b Merge "Use new metalava jar-to-diff command" into main am: 1c4b50f8c4
Original change: https://android-review.googlesource.com/c/platform/build/+/3047124

Change-Id: I883c310524fe6fcf436f3c7d584c2be175110870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-19 22:38:19 +00: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
78f5ac8c24 Merge "Deprecate USE_PREBUILT_SDK_TOOLS_IN_PLACE" into main am: ccd1f73c5f
Original change: https://android-review.googlesource.com/c/platform/build/+/3048332

Change-Id: I1c03dc5658f2eb01c552deabffd77230f16c86fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-19 01:04:14 +00:00
Jim Tang
ccd1f73c5f Merge "Deprecate USE_PREBUILT_SDK_TOOLS_IN_PLACE" into main 2024-04-19 00:47:08 +00:00
Daniel Zheng
682db9c4d6 Merge "add build property for compression_factor" into main am: b24b46d43f
Original change: https://android-review.googlesource.com/c/platform/build/+/2903193

Change-Id: Ife0702dd52eeb8f80f4ae0b44e0e8d1ff1a78a9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-18 21:14:07 +00:00
Daniel Zheng
b24b46d43f Merge "add build property for compression_factor" into main 2024-04-18 20:59:40 +00:00
Nikita Ioffe
f0ab43c1f5 Merge "Propagate PRODUCT_AVF_MICRODROID_GUEST_GKI_VERSION to soong" into main am: d0d74d2038
Original change: https://android-review.googlesource.com/c/platform/build/+/3044155

Change-Id: I46dfa34504c10d6c63c330243b0d0b31191b1433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-18 20:24:13 +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
2e9b1534f6 Merge "Revert^2 "Turn on V3 cow"" into main am: 78986f598f
Original change: https://android-review.googlesource.com/c/platform/build/+/3044532

Change-Id: I4bdfb9fd46645fafc1f6b2b2ecc257fcf7dfe0c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-18 17:37:17 +00: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
306edf5cd6 Merge "16k: build: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets" into main am: 185a3fc892
Original change: https://android-review.googlesource.com/c/platform/build/+/3042692

Change-Id: Ib760b055d3f05c0a99032e420187734d947af924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-17 20:52:10 +00: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
c1483546bb Merge "Add dependencies for module which define LOCAL_SOONG_INSTALL_PAIRS" into main am: 9194b690b1
Original change: https://android-review.googlesource.com/c/platform/build/+/3039064

Change-Id: I475977e2c0b76f1c815916fb9018f7c6918072cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-17 09:58:40 +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
365624371e Merge "Add flags for cgroup v2 and memcg v2 features" into main am: 70533992f4
Original change: https://android-review.googlesource.com/c/platform/build/+/3018323

Change-Id: If9bf7bfe2f575d5602a879f6daad491d487aaf8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-16 21:59:48 +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