Commit Graph

99104 Commits

Author SHA1 Message Date
Kiyoung Kim
02f95cfee5 Update allowlist based on internal system image
Allowlist of system image diff is generated based on the AOSP main, but this is not sufficient for internal main as it contains more items in the aosp_cf_x86_64_phone system image. This change adds more items in diff so aosp_cf_x86_64_phone build won't break from system image diff.

Bug: 346873717
Change-Id: Ic867ce1eb3f415976d37d91a201ebac0b45f0f1e
Test: aosp_cf_x86_64_phone build succeeded
Ignore-AOSP-First: Internal only feature
(cherry picked from commit 7d04b4d978)
2024-07-19 07:26:06 +00:00
Nikita Putikhin
6e25f26dab Merge "Use test install base template instead of a hardcoded path" into main am: bd0cba45be
Original change: https://android-review.googlesource.com/c/platform/build/+/3176019

Change-Id: Ic82c841725dd995748917dd2e0ccfd1281e2b097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-17 11:49:12 +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
Treehugger Robot
801fb946b4 Merge "Copy odex files from system_other to data/dalvik-cache on first boot" into main am: 3a2d9d2c50
Original change: https://android-review.googlesource.com/c/platform/build/+/3177659

Change-Id: I27170a4bd250de9663ed4f791bdfa7e84ff80408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-16 23:23:30 +00: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
31df911b46 Merge "Use CallableItem in place of MethodItem" into main am: 09bd57d0f1
Original change: https://android-review.googlesource.com/c/platform/build/+/3176259

Change-Id: Ibbfa5000bed6786e71ac4d47bfda146b20064434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-16 14:23:20 +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
235076ff5e Merge changes from topic "cf_system_root_files" into main am: 94d502200c
Original change: https://android-review.googlesource.com/c/platform/build/+/3163175

Change-Id: I6b864e73b7179186ffd4e68d096b754df1927bc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-16 05:11:17 +00:00
Inseob Kim
c9180bff8d Add files installed to root to diff allowlist am: 1f3f321967
Original change: https://android-review.googlesource.com/c/platform/build/+/3163174

Change-Id: Ic64c5373fb15662f31b3e283d8749608fa8533f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-16 05:11:10 +00: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
de49b7e6c4 Merge "Change java codegen to read from new storage" into main am: bce58b3c94
Original change: https://android-review.googlesource.com/c/platform/build/+/3174140

Change-Id: Ib7fe640a084f692bb10c00ddb49f781dc8947c08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 20:13:20 +00:00
Yeabkal Wubshit
b10ce3913c Merge "Include Wear flag values in sdk builds" into main am: acbc35aae9
Original change: https://android-review.googlesource.com/c/platform/build/+/3174060

Change-Id: I41976750e42ac14dea4e7256b3f3d918d87db955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 20:12:29 +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
c554725121 Merge "core/Makefile: Add desktop pack image hook." into main am: 32af178175
Original change: https://android-review.googlesource.com/c/platform/build/+/3167236

Change-Id: Ibd0800c5428df84abc3089515031edeedeba4da8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 16:45:11 +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
84ef49b57f Merge changes from topic "am-f9ee56e6607943ff8ca5de5609d46463" into main am: c067bcb19f
Original change: https://android-review.googlesource.com/c/platform/build/+/3164465

Change-Id: I2f112f7bc2e225f78fff6cab8da0d45a7d7e9b06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 04:24:34 +00:00
Tongbo Liu
bd7e621ddf [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: 944116ca58 -s ours
am skip reason: contains skip directive

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

Change-Id: Id33940114a3ec427fb30505b0d5fe8602c79392c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-15 04:24:26 +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
f5893e405c Merge "Link shared libs to per test module folder in host-unit-tests.zip" into main am: fb308d3c5d
Original change: https://android-review.googlesource.com/c/platform/build/+/3163460

Change-Id: Idf8e52891fe5e8afbdfb698d64dc430202fc0529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-12 22:13:10 +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
e944856ba0 Merge "add storage java reader" into main am: 6f9f7ccfe3
Original change: https://android-review.googlesource.com/c/platform/build/+/3168961

Change-Id: If1ee86dca35afb6fcc12e8c83b1934582a28176b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-12 14:06:23 +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
352b784929 Merge "Add owners for build/make/target/product/virtual_ab_ota" into main am: cb8ea3a6f1
Original change: https://android-review.googlesource.com/c/platform/build/+/3165046

Change-Id: I2ecd121bed26f9b505459d8ad1d6ff123b06ce65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 21:08:15 +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
c92444463b Merge "Revert "add storage java internal reader"" into main am: bb9f03efbe
Original change: https://android-review.googlesource.com/c/platform/build/+/3168856

Change-Id: If3cf11fa94bcfeb70fa3c30442b0ba72406be48f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 20:36:14 +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
f9c1b73113 Merge "add storage java internal reader" into main am: 657d68aee4
Original change: https://android-review.googlesource.com/c/platform/build/+/3168136

Change-Id: I742f761e6722b49c0278960a8b6705cc8becf75e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 19:24:45 +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
68249a141d Merge "fix: make device paths function static" into main am: 0d18be30ae
Original change: https://android-review.googlesource.com/c/platform/build/+/3164421

Change-Id: I7fd3e74a9cd1923ee449a41f584fc7be65df718e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-11 14:07:50 +00:00
Treehugger Robot
0d18be30ae Merge "fix: make device paths function static" into main 2024-07-11 13:48:51 +00:00
Treehugger Robot
0a1b4dfdaf Merge "Implement storage files in Java" into main am: 33118a7e83
Original change: https://android-review.googlesource.com/c/platform/build/+/3165076

Change-Id: I07259027a8305e11d7bb00cfe1d88d5c9e435c55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-10 23:47:51 +00:00
Treehugger Robot
33118a7e83 Merge "Implement storage files in Java" into main 2024-07-10 23:28:37 +00:00
Ted Bauer
ba67436d0d fix: make device paths function static
Bug: 342636474
Test: m
Change-Id: Iea745c39f8ef90543015c365ead4c02ee4ff6653
2024-07-10 23:15:08 +00:00