Commit Graph

37479 Commits

Author SHA1 Message Date
Ziwei Zhang
614a5aea0e Generate 2.0 config for Mobly test.
- Add `v2` suffix for ATS 2.0 config.
- Update the mobly test config template.

Test: m CtsBluetoothMultiDevicesTestCases (with `runner = "mobly"`)
Bug: 299850687
Change-Id: Ic95ecb760989818291f0746054e4f68d12359a9f
2024-02-04 03:18:52 +00:00
Treehugger Robot
c15bffbe07 Merge "Revert "Rename LOCAL_USE_VNDK"" into main am: 81c7511fed am: 5c40932a48
Original change: https://android-review.googlesource.com/c/platform/build/+/2946128

Change-Id: If950ab7bf5f16ac9032e38c4f93aa324061f8a2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-02 12:00:10 +00:00
Treehugger Robot
5c40932a48 Merge "Revert "Rename LOCAL_USE_VNDK"" into main am: 81c7511fed
Original change: https://android-review.googlesource.com/c/platform/build/+/2946128

Change-Id: I8aef8c9cfc738bda1c68d8e3b9f0dae8f6077356
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-02 11:19:41 +00:00
Harshit Mahajan
08a4f790d3 Merge "Revert^2 "[CrashRecovery] Add module to BCP and SSCP"" into main 2024-02-02 10:58:17 +00:00
Treehugger Robot
81c7511fed Merge "Revert "Rename LOCAL_USE_VNDK"" into main 2024-02-02 10:38:49 +00:00
Kiyoung Kim
0bf6c284e0 Revert "Rename LOCAL_USE_VNDK"
Revert submission 2931430-local_use_vndk

Reason for revert: build fails with barbet targets

Reverted changes: /q/submissionid:2931430-local_use_vndk

Change-Id: I40277cfb26bb4da5dc398b99fc4ab009d91405fc
2024-02-02 08:06:57 +00:00
Treehugger Robot
81fde978af Merge "Determine GC type based on BUILT_KERNEL_VERSION_FILE." into main am: 639fde3a4d am: 6c4bf6cccd
Original change: https://android-review.googlesource.com/c/platform/build/+/2919905

Change-Id: I61c82772d0e8bcf2675d2c4375202a00f34f665a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-02 04:08:17 +00:00
Treehugger Robot
d0fb763dc6 Merge "Rename LOCAL_USE_VNDK" into main am: 5058eac78b am: 027c34b501
Original change: https://android-review.googlesource.com/c/platform/build/+/2931430

Change-Id: I5e546e5d4963acbfe7ff6ecdfae05e331476385a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-02 04:07:58 +00:00
Treehugger Robot
6c4bf6cccd Merge "Determine GC type based on BUILT_KERNEL_VERSION_FILE." into main am: 639fde3a4d
Original change: https://android-review.googlesource.com/c/platform/build/+/2919905

Change-Id: I4ebb913d032ddf721149114875b182e437e7752f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-02 03:26:26 +00:00
Treehugger Robot
027c34b501 Merge "Rename LOCAL_USE_VNDK" into main am: 5058eac78b
Original change: https://android-review.googlesource.com/c/platform/build/+/2931430

Change-Id: Ie3b6affe1c49b4c7989a0f4fea5d02cd75a8c7e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-02 03:26:06 +00:00
Treehugger Robot
639fde3a4d Merge "Determine GC type based on BUILT_KERNEL_VERSION_FILE." into main 2024-02-02 03:01:57 +00:00
Treehugger Robot
5058eac78b Merge "Rename LOCAL_USE_VNDK" into main 2024-02-02 02:48:35 +00:00
Paul Scovanner
e604227e8d Merge "Update release team OWNERS for SPL updates" into main am: 67f1b704bb am: c268e33ad3
Original change: https://android-review.googlesource.com/c/platform/build/+/2944754

Change-Id: Ib940023e92ed7ca19ed2943d3fe1a0ea4b21e06c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-02 01:35:59 +00:00
Paul Scovanner
c268e33ad3 Merge "Update release team OWNERS for SPL updates" into main am: 67f1b704bb
Original change: https://android-review.googlesource.com/c/platform/build/+/2944754

Change-Id: If40b8d3ab4e0602cda5c404f1ff5b18b49f33709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-02 00:50:53 +00:00
Paul Scovanner
55b6567017 Update release team OWNERS for SPL updates
Bug: 323384238
Change-Id: I8d9ea3507b21a68ad2c3b61232d5e91d7f720a7f
2024-02-02 00:15:06 +00:00
Evgenii Stepanov
8566eb0ee8 Add missing linker flags for memtag sanitizers.
This fixes a discrepancy between Make and Soong build systems.
Memtag sanitizers rely on the linker to mark the executable as
requesting heap/stack/globals tagging.

Test: readelf -n <binary> | grep .note.android.memtag
Bug: 322107634
Change-Id: I4a25509ff280e25d14576157903a2bbf162a4895
2024-02-01 11:34:59 -08:00
Jiakai Zhang
53dd895407 Determine GC type based on BUILT_KERNEL_VERSION_FILE.
How it works:
1. build/make/core/Makefile generates a txt file with the kernel
   version, which is taken from an explicit BOARD_KERNEL_VERSION value,
   or extracted from the kernel image on the source tree, or extracted
   from the kernel image extracted from the prebuilt boot.img.
   The file is saved at
   $ANDROID_PRODUCT_OUT/obj/PACKAGING/check_vintf_all_intermediates/kernel_version.txt.
2. If PRODUCT_ENABLE_UFFD_GC is "default", meaning the GC type needs to
   be determined by the kernel version, build/make/core/Makefile copies
   kernel_version.txt to
   out/soong/dexpreopt/kernel_version_for_uffd_gc.txt.
3. build/soong/dexpreopt/config.go writes the the UFFD GC flag to
   out/soong/dexpreopt/uffd_gc_flag.txt. The flag is determined by an
   explicit PRODUCT_ENABLE_UFFD_GC value or by contruct_uffd_gc_flag.py,
   which reads kernel_version_for_uffd_gc.txt and determines the flag
   accordingly.
4. dex2oat takes the UFFD GC flag from uffd_gc_flag.txt.
5. post_process_props.py mangles ro.dalvik.vm.enable_uffd_gc based on
   the same logic.

Bug: 321751629
Bug: 319554951
Bug: 318763448
Bug: 319648491
Test: m --no-skip-soong-tests nothing
Test: atest uffd_gc_utils_test
Test: Build with `OVERRIDE_ENABLE_UFFD_GC=default m` for device with no
  UFFD support -
  1. Check the existence of `-Xgc:CMC` in
     out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot.invocation
     (dex2oat invocation for a boot image)
  2. Check the existence of `-Xgc:CMC` in
     out/soong/.intermediates/packages/apps/Settings/Settings/android_common/dexpreopt/Settings/oat/arm64/package.invocation
     (dex2oat invocation for an app defined in .bp)
  3. Check the existence of `-Xgc:CMC` in
     $ANDROID_PRODUCT_OUT/obj/APPS/Dialer_intermediates/oat/arm64/package.invocation
     (dex2oat invocation for an app defined in .mk)
  4. Check the value of ro.dalvik.vm.enable_uffd_gc in
     $ANDROID_PRODUCT_OUT/product/etc/build.prop
Test: Build with `OVERRIDE_ENABLE_UFFD_GC=default m` for device with
  UFFD support, and do the steps above.
Test: Build with `OVERRIDE_ENABLE_UFFD_GC=true m`, and do the steps
  above.
Test: Build with `OVERRIDE_ENABLE_UFFD_GC=false m`, and do the steps
  above.

Change-Id: I8df6e5be1644da05d2d5c57b3520f29601dfd7a4
2024-02-01 22:10:33 +08:00
LaMont Jones
239d5f3964 Merge changes Ife5eb1f8,I8d29c7ee into main am: 7ba1e17dcc am: 4e10abf2f0
Original change: https://android-review.googlesource.com/c/platform/build/+/2938283

Change-Id: I32521c6be06ae9f3c111e2d07fadc523ac567cc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-01 01:09:42 +00:00
LaMont Jones
4e10abf2f0 Merge changes Ife5eb1f8,I8d29c7ee into main am: 7ba1e17dcc
Original change: https://android-review.googlesource.com/c/platform/build/+/2938283

Change-Id: I35544b38eee0c94d4679759137c4db29ea113000
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-01 00:30:09 +00:00
LaMont Jones
7ba1e17dcc Merge changes Ife5eb1f8,I8d29c7ee into main
* changes:
  Add alias-release-config function
  Override release configs in depth
2024-01-31 23:45:13 +00:00
Harshit Mahajan
f39abd6ceb Revert^2 "[CrashRecovery] Add module to BCP and SSCP"
1b22a8e7dd

Bug: b/289203818
Test: m
(cherry picked from https://android-review.googlesource.com/q/commit:7b6a18c4bd9d195f2e0da5469c0d56751cd4dd51)
Merged-In: I4837ef66e14b06ce62be30e04eb988ebab9c2c6c
Change-Id: I4837ef66e14b06ce62be30e04eb988ebab9c2c6c
2024-01-31 14:39:07 +00:00
LaMont Jones
5939226ccb Merge "Add device_aconfig_declarations target" into main am: 2135347927 am: c369db98a1
Original change: https://android-review.googlesource.com/c/platform/build/+/2937719

Change-Id: I46aab3ace4107d5f44f60e8ce934333bc94f0156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-31 02:58:48 +00:00
LaMont Jones
c369db98a1 Merge "Add device_aconfig_declarations target" into main am: 2135347927
Original change: https://android-review.googlesource.com/c/platform/build/+/2937719

Change-Id: Ie9e6f2a3b50150fc9d0341803121a5d23b7fd949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-30 23:59:52 +00:00
LaMont Jones
2135347927 Merge "Add device_aconfig_declarations target" into main 2024-01-30 23:25:25 +00:00
LaMont Jones
61b0f799e2 Add alias-release-config function
This should be used to declare that a release config is an alias for
another one.  Aliases have no release config files of their own, and are
primarily used to simplify continuous integration as releases happen.

Bug: None
Test: manual
Change-Id: Ife5eb1f8f4bf8e06832dc55bbc390ce2f741ebb8
2024-01-30 23:07:15 +00:00
LaMont Jones
55d5fc504b Override release configs in depth
When overriding a release config, make sure that the overriden config is
fully present (by processing any of its overrides) before overriding it.

Bug: None
Test: manual
Change-Id: I8d29c7ee7208acf7fe63876f617c5b9e2c26c434
2024-01-30 23:06:08 +00:00
Xin Li
b793162412 Merge "Merge Android 24Q1 Release (ab/11220357)" into aosp-main-future 2024-01-30 22:44:44 +00:00
LaMont Jones
2e47c7bbd3 Add device_aconfig_declarations target
Building device_aconfig_declarations creates simplifies listing all
aconfig flags used on the device by creating a build artifact at:
$(OUT_DIR)/target/product/$(TARGET_PRODUCT)/device_aconfig_declarations.pb

Bug: b/308625757
Test: manual
Change-Id: Ic5eef9c6a26f7893b3f4bdfed2cd4ac82a54a8f9
2024-01-30 19:15:28 +00:00
Steven Moreland
9dbc541ec6 Merge "Support test runnner option in auto generated test configs" into android14-tests-dev am: 7b944b6220 am: 906b88c7d6 am: eed1c8772b
Original change: https://android-review.googlesource.com/c/platform/build/+/2924816

Change-Id: I1966038705c0f5cad774c2c7ee18e1ecd687df7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-30 18:50:34 +00:00
Xin Li
e693b5037e Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I21eb7d5dc8cef9c1dd797ba1ab2ee830a8a5a42b
Change-Id: I42210485ad8f07e19408bef0e5a2af23f6a0e596
2024-01-30 10:33:42 -08:00
Steven Moreland
8a29e9b345 Merge "Support test runnner option in auto generated test configs" into android14-tests-dev am: 7b944b6220
Original change: https://android-review.googlesource.com/c/platform/build/+/2924816

Change-Id: I742b21bf2cb2d3ea3aad49f70fa4dec5e8143a76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-30 18:11:27 +00:00
Kiyoung Kim
f4c9330e24 Rename LOCAL_USE_VNDK
LOCAL_USE_VNDK property refers if the module uses VNDK, and this
property is being used to check if the module is installed in vendor or
product. However, the term no longer makes sense with VNDK deprecation,
so it should be renamed. Similar to change in aosp/2897612, rename
LOCAL_USE_VNDK as LOCAL_IN_VENDOR or LOCAL_IN_PRODUCT.

Bug: 316829758
Test: AOSP CF build succeeded
Change-Id: Icfd1707953eba2e29044468ab6728b39d7998048
2024-01-30 17:10:39 +09:00
Steven Moreland
eed1c8772b Merge "Support test runnner option in auto generated test configs" into android14-tests-dev am: 7b944b6220 am: 906b88c7d6
Original change: https://android-review.googlesource.com/c/platform/build/+/2924816

Change-Id: I65f03e828a365b384245e753495d58c9f93a94c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-29 22:37:45 +00:00
Steven Moreland
906b88c7d6 Merge "Support test runnner option in auto generated test configs" into android14-tests-dev am: 7b944b6220
Original change: https://android-review.googlesource.com/c/platform/build/+/2924816

Change-Id: Ib94e37bb60c627b13ebde83b1f16f60df62425fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-29 21:55:29 +00:00
David Dai
85679cefdf Merge "Propagate virtual cpufreq related flags to soong" into main am: d1316f463c am: 3e7671fd2d
Original change: https://android-review.googlesource.com/c/platform/build/+/2928341

Change-Id: Ia3941b9196ce19ebecfd5925236dae5fa16fabd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-29 20:29:08 +00:00
David Dai
d1316f463c Merge "Propagate virtual cpufreq related flags to soong" into main 2024-01-29 19:16:09 +00:00
Treehugger Robot
e0db5521e3 Merge "Bump Java target from 1.7 to 1.8 in makefiles" into main am: bc32e2d878 am: 649c08739c
Original change: https://android-review.googlesource.com/c/platform/build/+/2927752

Change-Id: I4ac898c9b95f7b171f3ac18bb7e2e42528de58bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-26 19:14:59 +00:00
Treehugger Robot
bc32e2d878 Merge "Bump Java target from 1.7 to 1.8 in makefiles" into main 2024-01-26 17:44:00 +00:00
Sorin Basca
d35691dabe Bump Java target from 1.7 to 1.8 in makefiles
Bug: 320294595
Test: m
Change-Id: I66f3ebf2d6979a8b033c2f475fa21bae26ca97cd
2024-01-26 16:44:33 +00:00
David Dai
37a2484dad Propagate virtual cpufreq related flags to soong
Bug: 322415363
Test: builds
Change-Id: If7149d69946da636186fa69e2e092c758d6c8671
Signed-off-by: David Dai <davidai@google.com>
2024-01-25 18:42:58 -08:00
LaMont Jones
250b8d4b81 Merge "base_rules: Separate aconfig and module_info code" into main am: 0f0c6636ec am: 04172f2e17
Original change: https://android-review.googlesource.com/c/platform/build/+/2915007

Change-Id: I9024675e2d1d1c4cfb56dd3242ad0285c40fc8fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 23:55:50 +00:00
LaMont Jones
0f0c6636ec Merge "base_rules: Separate aconfig and module_info code" into main 2024-01-25 22:39:13 +00:00
LaMont Jones
89d97bf901 base_rules: Separate aconfig and module_info code
Record LOCAL_ACONFIG_FILES when LOCAL_SOONG_MODULE_INFO_JSON is defined.

Bug: b/308625757
Test: out/soong/module-info-${TARGET_PRODUCT}.json is unchanged
Test: fixes some aconfig flags.
Change-Id: I7ca9d2723e38ec5588bc6ada8769320a0b63bcb5
2024-01-25 19:15:09 +00:00
Dennis Shen
e15c79cc38 Merge "update flags.mk to create one storage file per rule" into main am: 00f4643347 am: b7ddda7f0a
Original change: https://android-review.googlesource.com/c/platform/build/+/2925170

Change-Id: Ifa37aaa750f38cdc16ab9099ce08e3f884826d66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 15:50:55 +00:00
Dennis Shen
00f4643347 Merge "update flags.mk to create one storage file per rule" into main 2024-01-25 14:39:21 +00:00
Treehugger Robot
f73b6eff8f Merge "Rename arch variant goldmont-without-xsaves to goldmont-without-sha-xsaves" into main am: e11290c27c am: e7830dd440
Original change: https://android-review.googlesource.com/c/platform/build/+/2926253

Change-Id: I5457e146e391d3517fe7984fc220d87af90babad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 09:28:25 +00:00
Treehugger Robot
e11290c27c Merge "Rename arch variant goldmont-without-xsaves to goldmont-without-sha-xsaves" into main 2024-01-25 08:11:40 +00:00
Treehugger Robot
015c52e0d9 Merge "Enable clang coverage" into main am: 75d530cbff am: 34171035a1
Original change: https://android-review.googlesource.com/c/platform/build/+/2754247

Change-Id: Iaf42a92fe8980e72ff518f70062cc767fcab8625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 06:59:41 +00:00
Treehugger Robot
75d530cbff Merge "Enable clang coverage" into main 2024-01-25 06:18:24 +00:00
Dan Shi
c1e550d515 Support test runnner option in auto generated test configs
Bug: 284179405
Bug: 236980335
Test: unittest
Change-Id: I7f96a2a2bc52316888e87af7e4bcc4ef50863716
2024-01-24 21:12:40 +00:00