Commit graph

76808 commits

Author SHA1 Message Date
Jiakai Zhang
21d0333357 Merge "Set TARGET_USES_64_BIT_BINDER for mainline_sdk." am: d02946c4c3
Original change: https://android-review.googlesource.com/c/platform/build/+/2121572

Change-Id: I40e650cf5fbb39607b2db295969836b5ab5cf837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 09:27:51 +00:00
Jiakai Zhang
d02946c4c3 Merge "Set TARGET_USES_64_BIT_BINDER for mainline_sdk." 2022-06-13 09:11:29 +00:00
Ulya Trofimovich
8b9f334eed Revert "Dexpreopt: prepare to merge class loader context from al..."
Reason for revert: performance regression on AppStartup.
Reverted Changes:
I6522319a8:Dexpreopt: prepare to merge class loader context f...
Ic8528dffd:manifest_check.py: add uses-libraries propagaged v...

Bug: 235304939
Bug: 214255490
Change-Id: Iff6ad6f0d862df259bf9e3dd7017c268dbcbf8bf
2022-06-13 09:06:59 +00:00
Yi-yo Chiang
4acadd0afe Merge "Add ro.force.debuggable=0 to ADDITIONAL_SYSTEM_PROPERTIES" am: 109f63823b
Original change: https://android-review.googlesource.com/c/platform/build/+/2120223

Change-Id: Iff04ab49e4ce32c72ea1ea5dd7728fc5624eb70d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 06:41:14 +00:00
Yi-yo Chiang
109f63823b Merge "Add ro.force.debuggable=0 to ADDITIONAL_SYSTEM_PROPERTIES" 2022-06-13 06:17:47 +00:00
Treehugger Robot
4c3372bdf9 Merge "Add wifi_module/source_build Soong config variable" am: aa3bc3be79
Original change: https://android-review.googlesource.com/c/platform/build/+/2121573

Change-Id: Ic2bd289081f4b6e7a52086df4879350284abe339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 19:45:31 +00:00
Treehugger Robot
1e80852887 Merge "Record license text for every dist target." am: f0bb8291c8
Original change: https://android-review.googlesource.com/c/platform/build/+/2115690

Change-Id: I2f11886c8c64c7d239cdac8a91bde83920b9106d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 19:44:38 +00:00
Treehugger Robot
f4cf61e9b8 Merge "Revert "Revert "Create lists of projects to share per dist target""" am: e25ddc0453
Original change: https://android-review.googlesource.com/c/platform/build/+/2066749

Change-Id: I862a320ebd81067b6a2a467540e89c18c8f2752c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 19:42:22 +00:00
Treehugger Robot
aa3bc3be79 Merge "Add wifi_module/source_build Soong config variable" 2022-06-10 18:46:17 +00:00
Treehugger Robot
f0bb8291c8 Merge "Record license text for every dist target." 2022-06-10 18:09:41 +00:00
Treehugger Robot
e25ddc0453 Merge "Revert "Revert "Create lists of projects to share per dist target""" 2022-06-10 18:09:03 +00:00
Jiakai Zhang
f5637f94fe Set TARGET_USES_64_BIT_BINDER for mainline_sdk.
Devices are all using 64 bit binder, and mainline_sdk should too.
According the comment here: https://cs.android.com/android/platform/superproject/+/master:build/make/target/board/BoardConfigMainlineCommon.mk;l=25;drc=6e7693f1597a0934833a72faf35e918dfbdb6ecd,
this flag is required even for non-64 bit devices.

`libbinder` doesn't compile on host with 32 bit binder.

Test: packages/modules/common/build/mainline_modules_sdks.sh \
        --build-platform-sdks-for-mainline --build-release=latest
Change-Id: I357ce42e88ad13ed259d573b9dd2bbfc27b82687
2022-06-10 14:35:53 +01:00
Paul Duffin
4f4b6d776d Add wifi_module/source_build Soong config variable
As an optional module, wifi has its own Soong config variable. This
change ensures that it is controlled by the same environment variable
as the rest of the modules.

Bug: 233965247
Test: # Unpack wifi snapshot that uses wifi specific Soong config.
      m nothing
      # Without this the build fails as it uses the wifi prebuilts
      # which do not work in AOSP.
      # With this change the build passes as it uses the wifi
      # sources.
Change-Id: Iea0ad09182a162b8f5ddf1403f65a3bbffb9ef08
2022-06-10 11:26:16 +00:00
Yi-Yo Chiang
70b69de18a Add ro.force.debuggable=0 to ADDITIONAL_SYSTEM_PROPERTIES
This should only be set to '1' by flashing debug boot image,
so default to '0' in system/build.prop.

Bug: 223517900
Test: Boot with and without debug boot image and check value of property
Change-Id: I0e0df7d86a31fd771248433513483e8ad600b5ed
2022-06-10 15:28:31 +08:00
Treehugger Robot
d810636ae4 Merge "Obsolete BOARD_PLAT_*_SEPOLICY_DIR" am: 7e91201269
Original change: https://android-review.googlesource.com/c/platform/build/+/2120476

Change-Id: I63d345a786fafc39668922be2ea230e6518cff9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 02:16:03 +00:00
Treehugger Robot
7e91201269 Merge "Obsolete BOARD_PLAT_*_SEPOLICY_DIR" 2022-06-10 01:56:16 +00:00
Dan Willemsen
b34c387441 Obsolete BOARD_PLAT_*_SEPOLICY_DIR
These were marked as deprecated in late 2020 [1]. Shortly later, there
was an attempt to obsolete them [2] for products shipping with API level
31 or greater, but that was reverted [3] because of internal users.

1: I58c64839cc513ae082cd3ee3c1e108843ea7439e
2: Ic4d1164be611836f6aa697fbf1cb1f1c73a3cd39
3: I7d3556aa0f06684b43f80f09e4c8194c6c44336c

Since these are causing warnings on every build, and there are no more
internal users, just obsolete them entirely. We don't need to rely on
the product shipping api level, since that does not guarantee
source-level compatibility -- and this is an easy fix even if people
have been ignoring the real warnings.

Bug: 235414673
Test: treehugger
Change-Id: If803a33efc38a970247919bf224c12b8c717f955
2022-06-09 09:36:52 -07:00
Treehugger Robot
c239aba6b9 Merge "Fix license package name and provide license text." am: 294aeed6d5
Original change: https://android-review.googlesource.com/c/platform/build/+/2115689

Change-Id: I64e11cbca9a3439dc45dfc9a6ddad31a73269b0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 10:44:32 +00:00
Treehugger Robot
294aeed6d5 Merge "Fix license package name and provide license text." 2022-06-09 10:25:34 +00:00
Bob Badour
7e8b6ff262 Merge "Fix recovery_unit_test" am: 32e14db707
Original change: https://android-review.googlesource.com/c/platform/build/+/2120582

Change-Id: I189781ce08111fb468fc8fadc605495ba805f265
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:43:53 +00:00
Bob Badour
32e14db707 Merge "Fix recovery_unit_test" 2022-06-09 03:14:35 +00:00
Bob Badour
5c0ec6a5a6 Record license text for every dist target.
Bug: 151177513
Bug: 210912771
Bug: 235333302
Bug: 232138105

Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_coral_hwasan TARGET_BUILD_VARIANT=userdebug droid dist with-license platform_tests continuous_instrumentation_tests continuous_native_tests

Change-Id: Ibd737c0dd0a35e19529ab08472f4d1bc1195efbd
2022-06-08 18:49:37 -07:00
Bob Badour
82040d9882 Revert "Revert "Create lists of projects to share per dist target""
This reverts commit 59e4951021.

Reason for revert: Attempt to roll forward again.

Test: m droid dist reportmissinglicenses

Change-Id: Ibf5a9869d03726e279fb23bf68ca66547b972138
2022-06-08 18:49:20 -07:00
Bob Badour
8ef100aee9 Fix license package name and provide license text.
Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_coral_hwasan TARGET_BUILD_VARIANT=userdebug droid dist with-license platform_tests continuous_instrumentation_tests continuous_native_tests

Change-Id: Ic450732083773668bf9d9d0e1fffa1852f88ab45
2022-06-08 18:28:04 -07:00
Bob Badour
fc26ac07a4 Fix recovery_unit_test
Return to using zip instead of SOONG_ZIP

Bug: 235405168

Test: m droid dist
Change-Id: I6f0f2fa7861bca18e34576c920a3c33ffef6b46e
2022-06-08 17:03:02 -07:00
Spandan Das
4eb1aa94cc Fix broken test_lunch.py
The orchestrator path inside the test workspace (test/configs) is
build/make, which is different from the current path in multitree
(build/build/make). This was causing `python test_lunch.py` to fail

Rather than restructing the test workspace to build/build/make now (and
build/ later when the orchestrator is in its own project), create a
Context object which can be mocked.

Test: python test_lunch.py
Change-Id: Ibd89c3ff0204ebad320c90a05bab4c0f8c86b3a0
2022-06-08 21:14:52 +00:00
Kousik Kumar
2a3ace57ad Merge "Update rbesetup.sh script to no longer set certain env variables" am: ee8e14f33a
Original change: https://android-review.googlesource.com/c/platform/build/+/2108567

Change-Id: I00ffe91793aa0fca119c1a2fe27aa15fb91264a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 19:20:46 +00:00
Kousik Kumar
ee8e14f33a Merge "Update rbesetup.sh script to no longer set certain env variables" 2022-06-08 18:55:54 +00:00
Treehugger Robot
53a766a447 Merge "finalize_branch_for_release.sh: avoid envsetup.sh" am: ac7eeb78ef
Original change: https://android-review.googlesource.com/c/platform/build/+/2115553

Change-Id: Ie0f9758c0d94229e507417a8aa9fb937817aa72c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 02:32:52 +00:00
Treehugger Robot
ac7eeb78ef Merge "finalize_branch_for_release.sh: avoid envsetup.sh" 2022-06-08 02:04:43 +00:00
Treehugger Robot
93eeaf4f67 Merge "Fix pitfall: do not delete intermediates dir." am: 5c6b4e029b
Original change: https://android-review.googlesource.com/c/platform/build/+/2116088

Change-Id: I184b8606377d81b4deda9ee0eb0ac36f8edfd39e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 22:52:32 +00:00
Treehugger Robot
5c6b4e029b Merge "Fix pitfall: do not delete intermediates dir." 2022-06-07 22:28:40 +00:00
Treehugger Robot
123a85e7fb Merge "Remove danielnorman@ from OWNERs." am: 6417dca03f
Original change: https://android-review.googlesource.com/c/platform/build/+/2118053

Change-Id: Ib3b729c7e6200795a2849a21777278d3a7f121d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 21:36:12 +00:00
Treehugger Robot
6417dca03f Merge "Remove danielnorman@ from OWNERs." 2022-06-07 21:20:00 +00:00
Daniel Norman
731767c99d Remove danielnorman@ from OWNERs.
Bug: 235251309
Change-Id: I164b4fcd2abbe0bd5a0a73c29887d7804f87544a
2022-06-07 19:26:54 +00:00
Steven Moreland
4d4b5802fd finalize_branch_for_release.sh: avoid envsetup.sh
Avoid envsetup.sh, which is configuring the environment in a
way that breaks builds on the build servers. This exposes an
issue with the AIDL freeze that was lost in the meantime.

Bug: 234734342
Test: (run script, there is an audio failure)
Change-Id: Ic2888fb316d295a06f465f33d3a6f348a65c30a5
2022-06-07 17:49:46 +00:00
Bob Badour
eb9431ee8a Fix pitfall: do not delete intermediates dir.
Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_coral_hwasan TARGET_BUILD_VARIANT=userdebug droid dist with-license platform_tests continuous_instrumentation_tests continuous_native_tests

Change-Id: Ibf1bff6ee67e4958b1e1ea2fbc0385787d3bf0f0
2022-06-07 10:02:12 -07:00
Treehugger Robot
7c82ad9e56 Merge "Using BOARD_AVB_VBMETA_VENDOR_IMAGE_ARGS for vbmeta_vendor.img" am: 1053d69c1f
Original change: https://android-review.googlesource.com/c/platform/build/+/2116299

Change-Id: I28110ed3b10969c5d0b2fbb57408bbe96f477e9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 16:37:25 +00:00
Treehugger Robot
1053d69c1f Merge "Using BOARD_AVB_VBMETA_VENDOR_IMAGE_ARGS for vbmeta_vendor.img" 2022-06-07 16:18:03 +00:00
Bowgo Tsai
c85a201d5e Using BOARD_AVB_VBMETA_VENDOR_IMAGE_ARGS for vbmeta_vendor.img
The value of BOARD_AVB_VBMETA_SYSTEM_IMAGE_ARGS and
BOARD_AVB_VBMETA_VENDOR_IMAGE_ARGS are usually the same, e.g.,
--padding_size 4096 --rollback_index 1656979200.

However, in a split build, the value of
BOARD_AVB_VBMETA_SYSTEM_IMAGE_ARGS might be empty.
Using BOARD_AVB_VBMETA_VENDOR_IMAGE_ARGS to correctly
assign the value for vbmeta_vendor.img.

Bug: 232360330
Test: TreeHugger
Change-Id: Ia26816bd309084c3a4c0df6b9f2f3fc5a28bc31a
2022-06-07 11:36:35 +08:00
Treehugger Robot
4033d64768 Merge "Improve flags for compliance tools." am: 10714789a9
Original change: https://android-review.googlesource.com/c/platform/build/+/2116674

Change-Id: Ia092df3daa4a98aadebfb9010c1272c27b813f5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 01:13:10 +00:00
Treehugger Robot
10714789a9 Merge "Improve flags for compliance tools." 2022-06-07 00:51:23 +00:00
Ulya Trofimovich
a7d23f9e86 Merge "Dexpreopt: prepare to merge class loader context from all deps." am: 3eff61ca8a
Original change: https://android-review.googlesource.com/c/platform/build/+/2079378

Change-Id: I1408468ad3a3c178b2fc354adc6db3ea11a47292
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 13:11:25 +00:00
Ulya Trofimovich
3eff61ca8a Merge "Dexpreopt: prepare to merge class loader context from all deps." 2022-06-06 12:50:34 +00:00
Treehugger Robot
c3a915294b Merge "[Bugfix] Check for presence before ZipWrite" am: bb8d9ed70f
Original change: https://android-review.googlesource.com/c/platform/build/+/2115654

Change-Id: I92c7726a576bde300541f02fc16936f846057b16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 05:18:00 +00:00
Treehugger Robot
bb8d9ed70f Merge "[Bugfix] Check for presence before ZipWrite" 2022-06-04 05:03:01 +00:00
Bob Badour
986a839161 Improve flags for compliance tools.
Test: m droid dist reportmissinglicenses

Change-Id: I4090dae3d5d33d1908d67dff31aeee92d2b261da
2022-06-03 12:44:22 -07:00
jiangxu5
b67b0d5bc0 [Bugfix] Check for presence before ZipWrite
There are vendor products but no *.map situation

Signed-off-by: jiangxu5 <jiangxu5@xiaomi.com>
Change-Id: I93a710fd10870b7406b1d7beb5a6f51b6badc104
2022-06-03 14:46:56 +08:00
Treehugger Robot
62f582272d Merge "Create license metadata for copied targets." am: 1f0c3583a6
Original change: https://android-review.googlesource.com/c/platform/build/+/2109383

Change-Id: I7998946185221bf572ff678c837893dcf0b44064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 03:14:22 +00:00
Treehugger Robot
1f0c3583a6 Merge "Create license metadata for copied targets." 2022-06-03 02:05:02 +00:00