Commit Graph

98413 Commits

Author SHA1 Message Date
Parth Sane
01e6b4bc51 Merge "Export the libbinder flag to Android.bp" into main 2024-07-22 12:22:05 +00:00
Christopher Ferris
3b8f6ebbb7 Merge "Replace PRODUCT_DISABLE_SCUDO with MALLOC_LOW_MEMORY." into main 2024-07-20 01:36:55 +00:00
Treehugger Robot
088443385f Merge "only use new storage for read write" into main 2024-07-19 21:39:45 +00:00
Christopher Ferris
7064db2a19 Replace PRODUCT_DISABLE_SCUDO with MALLOC_LOW_MEMORY.
The PRODUCT_DISABLE_SCUDO only removes scudo from the list of
sanitizers. It doesn't change the allocator to be used.

Instead use MALLOC_LOW_MEMORY := true, which causes a device
to use a low memory version of the allocator.

Bug: 318756974

Test: Treehugger.
Change-Id: Idaf57cfa4fa723ce8d7f285b2bad8ec29059f0df
2024-07-19 21:38:52 +00:00
Zhi Dou
1edd4485c6 only use new storage for read write
Test: atest aconfig.test.java
Bug: 349874828
Change-Id: I5af9fa6243b8b8a157f03242e6e5a411ced7be44
2024-07-19 20:37:53 +00:00
Treehugger Robot
ca4c83efa3 Merge "feat: show if flag is locally overridden" into main 2024-07-19 14:09:41 +00:00
Ted Bauer
05fea28d9c feat: show if flag is locally overridden
Bug: 324436145
Test: adb shell aflags list
Change-Id: Id239a760e86e469f77d1e99f7a6f27d54cb87206
2024-07-19 13:11:42 +00:00
Treehugger Robot
d9fc22aeda Merge "Pass PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD to Soong" into main 2024-07-19 03:21:23 +00:00
Kiyoung Kim
c7fea48094 Pass PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD to Soong
Pass PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD to Soong so it can decide if
ART debug APEX should be used instead of ART APEX

Bug: 351698657
Test: AOSP CF eng build succeeded
Change-Id: I1e0683be5cd66f1a18e7aec5b1d96ac6e5f4588a
2024-07-19 10:14:05 +09:00
LaMont Jones
1997e9f786 Merge "Pass the target product to release-config" into main 2024-07-18 23:01:11 +00:00
Michael Wright
41b64550d8 Pass the target product to release-config
If you don't, release-config will read the TARGET_PRODUCT environment
variable to determine the product. This works in most cases, but it's
possible (e.g. via buildspec.mk) to change the target product within
make without modifying the environment variable. In these cases,
release-config will produce the config for one product but then the
build will read the config for a completely different product, leading
to build errors.

Instead, just pass the target product to release-config explicitly so it
generates the config for the product that the build is expecting.

Bug: 353351911
Test: TARGET_SKIP_OTA_PACKAGE="true" build/soong/soong_ui.bash \
    --make-mode TARGET_PRODUCT=apps TARGET_RELEASE=next \
    TARGET_BUILD_VARIANT=user droid dist \
    ANDROID_BUILDSPEC=vendor/google_clockwork/build/app_build_spec.mk \
    ALLOW_MISSING_DEPENDENCIES=true \
    UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true \
    RELAX_USES_LIBRARY_CHECK=true
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:310d7718439d074fe38b25b97eb609f6db66c3d6)
Merged-In: I63e80249ac702b5517f4a3cfd54c8a4dbd416794
Change-Id: I63e80249ac702b5517f4a3cfd54c8a4dbd416794
2024-07-18 20:36:10 +00:00
Treehugger Robot
726c69d608 Merge "Use JDK 21 instead of 17" into main 2024-07-18 16:47:48 +00:00
Parth Sane
560884d4af Export the libbinder flag to Android.bp
Note that the namespace is "libbinder".

Bug: 333854840
Test: N/A
Flag: RELEASE_LIBBINDER_CLIENT_CACHE
Change-Id: Iecfb62c14685afcce72cf89ad61536efd2d17e31
2024-07-18 14:24:01 +00:00
Ted Bauer
7e272b8bba Merge "Read from new storage in aflags" into main 2024-07-18 13:32:59 +00:00
Sorin Basca
ba29ac54f4 Use JDK 21 instead of 17
Bug: 342332820
Test: TH
Change-Id: Id040a389243220eb4c5b47631bfdd9f27bc00923
2024-07-18 12:05:19 +01:00
Treehugger Robot
60f44e93a8 Merge "Add ASAN_ENABLED and SANITIZE_TARGET_SYSTEM_ENABLED to Soong config variables:" into main 2024-07-18 05:52:52 +00:00
Treehugger Robot
083e56837b Merge "Add BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT as a soong config variable" into main 2024-07-18 00:44:49 +00:00
Ted Bauer
bbbe092496 Read from new storage in aflags
Bug: 324436145
Test: adb shell aflags list --use-new-storage
Change-Id: Ib615e25bc0bc7f2b0362e286a45ce40ebf21f92d
2024-07-17 18:39:25 +00:00
Nikita Putikhin
bd0cba45be Merge "Use test install base template instead of a hardcoded path" into main 2024-07-17 11:34:28 +00:00
Nelson Li
39f5cc4153 Add ASAN_ENABLED and SANITIZE_TARGET_SYSTEM_ENABLED to Soong config variables:
`SANITIZE_TARGET` is a variable in Android's build system used to
enable sanitizers. Currently, Soong only supports enabling SANITIZE for
individual modules in Android.bp.
Adding ASAN_ENABLED and SANITIZE_TARGET_SYSTEM_ENABLED as Soong config
variables would allow Soong to also support building with Sanitizers by
directly setting the SANITIZE_TARGET environment variable.

Bug: 353164536
Test: SANITIZE_TARGET_SYSTEM=true SANITIZE_TARGET=address m -j asan_extract
Change-Id: I542239ee25d210d903d2481a2b1426f756656308
2024-07-17 16:56:58 +08:00
Nelson Li
12c7751ff2 Add BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT as a soong config variable
This variable allow customizing whether the `ramdisk` and
`vendor_ramdisk` are included in the boot image (ramdisk) or the
vendor boot image (vendor_ramdisk). This is useful for devices that
move recovery resources to the vendor boot partition

Bug: 347636127
Test: Add it to soong_config_module_type
Change-Id: If7a126fe8bdc69173921c0b01f85fb9480f4a36f
2024-07-17 12:02:59 +08:00
Treehugger Robot
3a2d9d2c50 Merge "Copy odex files from system_other to data/dalvik-cache on first boot" into main 2024-07-16 23:02:20 +00:00
Spandan Das
4388643d21 Copy odex files from system_other to data/dalvik-cache on first boot
This is currently not the default behavior. products opt-in by
setting ro.cp_system_other_odex=1 (with cuttlefish being the only
product family in internal main that sets this).

With https://r.android.com/3144182, the odex files of system_ext and
product are now installed in system_other. Since the odex files are not
copied to /data, it triggers dexopt on device, which slows down first
boot performance.

This CL changes makes cp_system_other_odex=1 in
build/make/target/product/runtime_libart.mk. This file is inherited by
internal google products and external OEMs, and ensures that the odex
files are copied from system_other to /data/dalvik-cache on first boot.

Test: lunch oriole-trunk_staging-userdebug && get_build_var
PRODUCT_VENDOR_PROPERTIES # verified that this property is set

Test: In logcat, found the following match for `CalendarGooglePrebuilt`
(a /product app)
```
Successfully loaded /data/dalvik-cache/arm64/product@app@CalendarGooglePrebuilt@CalendarGooglePrebuilt.apk@classes.dex with executable: 0
/data/dalvik-cache/arm64/product@app@CalendarGooglePrebuilt@CalendarGooglePrebuilt.apk@classes.dex is kOatUpToDate with filter verify
Dexopt result: [packageName = com.google.android.calendar] DexContainerFileDexoptResult{dexContainerFile=/product/app/CalendarGooglePrebuilt/CalendarGooglePrebuilt.apk, primaryAbi=true, abi=arm64-v8a, actualCompilerFilter=verify, status=SKIPPED, dex2oatWallTimeMillis=0, dex2oatCpuTimeMillis=0, sizeBytes=0, sizeBeforeBytes=0, extendedStatusFlags=[]}

```
Bug: 349083274
Bug: 343367700

Change-Id: I42eda6742adcce7caccb1f2302578c01df8a24fd
2024-07-16 18:50:32 +00:00
Treehugger Robot
09bd57d0f1 Merge "Use CallableItem in place of MethodItem" into main 2024-07-16 14:05:50 +00:00
Nikita Putikhin
8722201866 Use test install base template instead of a hardcoded path
** This CL reapplies aosp/3150696. Now it is connected to a
corresponding change in rust soong module to ensure system test dir does
not change to avoid b/350479879. **

Make the template more consistent with the native (aka cc) test temlate.

The important change is that vendor tests will be pushed into
/data/local/tests/vendor.

Having the test binary in the vendor test folder makes the linker treat
it as a vendor binary and prefer vendor libraries. Previously, the test
binary was always a system binary (due to being in /data/local/tmp) and
used system libraries first potentially leading to bugs (e.g. the one
attached).

This change also makes vendor tests that use vendor libraries require
root due to an existing SELinux policy issue with atest.

Bug: 347370677
Test: checked with:
 - libsecretkeeper_core_test
 - libauthgraph_boringssl_test
 - libdice_policy.test
 Test steps:
 atest -d <test>.vendor # runs vendor variant, passes
 adb root
 adb shell find / -iname <test> 2>/dev/null
 # before change: /data/local/tmp/<test>
 # after change: /data/local/tests/vendor/<test>
Test: v2/android-kvm-team/avf_presubmit_tests
Change-Id: I19793bd20bc23ff0c78e622bc6b93f9a90d725c0
2024-07-16 12:41:19 +00:00
Paul Duffin
9acbefe223 Use CallableItem in place of MethodItem
The `MethodItem` type represents both a normal method as well as being
the super type of `ConstructorItem`. That organization causes a number
of issues in Metalava and has lead to quite a few issues where code
that only expected to be run on methods and not constructors was run on
both. So, a new type `CallableItem` has been added that will eventually
become the super type of both `MethodItem` and `ConstructorItem` and
`ConstructorItem` will no longer extend `MethodItem`.

This change prepares this code for that change by overriding
`visitCallable(CallableItem)` instead of `visitMethod(MethodItem)`
because the latter is only called for methods not constructors.

Bug: 352481366
Test: atest check-flagged-apis-test
Change-Id: I3039bc0154b00ca57cb48c7447c5901b991b57e5
2024-07-16 13:37:30 +01:00
Inseob Kim
94d502200c Merge changes from topic "cf_system_root_files" into main
* changes:
  Add option to use Soong defined system image
  Add files installed to root to diff allowlist
2024-07-16 04:52:08 +00:00
Inseob Kim
8b6f143b0c Add option to use Soong defined system image
By `USE_SOONG_DEFINED_SYSTEM_IMAGE`, a system image specified by
PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE will replace $OUT/system.img.

Bug: 350599472
Test: USE_SOONG_DEFINED_SYSTEM_IMAGE=true m && cvd start
Change-Id: I294ea5e1ce7f9273d0dafc440320b8f194ccf5ca
2024-07-16 03:01:40 +00:00
Inseob Kim
1f3f321967 Add files installed to root to diff allowlist
system.img is built from both $OUT/system and $OUT/root. As the diff
tool doesn't check $OUT/root, this change temporarily adds two files
under root (adb_keys and init.environ.rc) to allowlist. They will be
removed once the diff tool is fixed.

Bug: 351258461
Test: build
Change-Id: I0f24dcae67c72be5619a86f6f025ec8bcb146084
2024-07-16 03:01:26 +00:00
Treehugger Robot
bce58b3c94 Merge "Change java codegen to read from new storage" into main 2024-07-15 20:09:01 +00:00
Yeabkal Wubshit
acbc35aae9 Merge "Include Wear flag values in sdk builds" into main 2024-07-15 19:52:47 +00:00
Zhi Dou
9f8ed73934 Change java codegen to read from new storage
This change adds code in java code to read from new storage. However the
generated code won't geneerate code contains code for new storage, since
the build system won't pass `allow-instrumentation` to java codegen.

Test: atest aconfig.test.java
Bug: 349874828
Change-Id: I70983fa97de6633f467d968109d134d46f895a89
2024-07-15 19:08:33 +00:00
Yeabkal Wubshit
4bf41fda53 Include Wear flag values in sdk builds
Wear APIs are currently not being included in sdk builds, since Wear
flags are not part of the default set of flags read by the build system.
To mitigate this, we are explicitly including Wear flags in the list of
flags processed for sdk builds.

Bug: 350775600
Test: sdk builds contain Wear flags
Change-Id: I9e78a7f4282fa80a2ea30cbbc358c8e45ced0a9e
2024-07-15 17:55:05 +00:00
Treehugger Robot
32af178175 Merge "core/Makefile: Add desktop pack image hook." into main 2024-07-15 16:10:16 +00:00
Automerger Merge Worker
c067bcb19f Merge changes from topic "am-f9ee56e6607943ff8ca5de5609d46463" into main
* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046." into android14-tests-dev am: 560eb19582 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046. am: b60ebe0d7f -s ours
2024-07-15 03:52:39 +00:00
Tongbo Liu
944116ca58 [automerger skipped] Merge "RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046." into android14-tests-dev am: 560eb19582 -s ours
am skip reason: contains skip directive

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

Change-Id: Ic9c196441e5fbc5c61bb6cfa700ec74be6861c17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 03:52:32 +00:00
Tongbo Liu
692f7709d0 [automerger skipped] RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046. am: b60ebe0d7f -s ours
am skip reason: contains skip directive

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

Change-Id: Ibf3ca3fe769ea0b37e5a2f30d906fa722bf2a700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 03:52:28 +00:00
Tongbo Liu
560eb19582 Merge "RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046." into android14-tests-dev 2024-07-15 03:36:43 +00:00
Yike Zhang
fb308d3c5d Merge "Link shared libs to per test module folder in host-unit-tests.zip" into main 2024-07-12 21:52:51 +00:00
yike
79422c8ed9 Link shared libs to per test module folder in host-unit-tests.zip
Downstream testing infra needs per test module folder to be
self-contained to prune dependencies and increase testing efficiency.

Bug: 351909435
Test: presubmit
Change-Id: Icda8982af8eb223ba4ae45be7975dc5aa42a183e
2024-07-12 20:58:37 +00:00
Zhi Dou
6f9f7ccfe3 Merge "add storage java reader" into main 2024-07-12 13:44:27 +00:00
Zhi Dou
621323cfda add storage java reader
Test: atest aconfig_storage_read_api.test.java
Bug: 349874828
Change-Id: I4b1d5ccf4d48622a88712b6e8940ffe18e980927
2024-07-12 13:34:12 +00:00
Treehugger Robot
cb8ea3a6f1 Merge "Add owners for build/make/target/product/virtual_ab_ota" into main 2024-07-11 20:53:24 +00:00
Priyanka Advani
bb9f03efbe Merge "Revert "add storage java internal reader"" into main 2024-07-11 20:01:41 +00:00
Priyanka Advani
16c8d3c47a Revert "add storage java internal reader"
This reverts commit 70b9ac0ddd.

Reason for revert: Droidmonitor created revert due to build breakages in b/352582602.

Change-Id: I8a8e38ccf3e715e9b4746ac333aed0cc13d11969
2024-07-11 19:59:24 +00:00
Zhi Dou
657d68aee4 Merge "add storage java internal reader" into main 2024-07-11 19:02:16 +00:00
Zhi Dou
70b9ac0ddd add storage java internal reader
Test: n/a
Bug: n/a
Change-Id: I852ab4080bee9240549dc4be0c09dbe1f72d06b0
2024-07-11 18:50:46 +00:00
Kelvin Zhang
2421247136 Add owners for build/make/target/product/virtual_ab_ota
Test: th
Bug: 352538699
Change-Id: Id79ff979aeb13fc8b9de7505f25f90e5cf12551b
2024-07-11 09:28:20 -07:00
Alex Klein
807eb549b5 core/Makefile: Add desktop pack image hook.
Desktop currently has a custom pack image script that is valuable
to run in pre/post-submit builders. Add hook to the core Makefile
to allow running it.

Bug: b:349581445
Test: m
Change-Id: I368d3c8278beeee9f5c3e863043869c18e773728
2024-07-11 10:23:18 -06:00
Treehugger Robot
0d18be30ae Merge "fix: make device paths function static" into main 2024-07-11 13:48:51 +00:00