Commit Graph

1747 Commits

Author SHA1 Message Date
Treehugger Robot
2a092d2b01 Merge "Build product/odm build.prop with Soong" into main am: 57ac3a18ea
Original change: https://android-review.googlesource.com/c/platform/build/+/3213597

Change-Id: Id80b6d3f789b45f8d2e2bff6c4bd51d8e032eadf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-12 00:36:42 +00:00
Inseob Kim
d05947dd12 Build product/odm build.prop with Soong
Bug: 322090587
Test: compare build.prop before and after, boot
Change-Id: Iab157cf313d62c1c95ef66dd0a2b9563ee60ab46
2024-08-08 17:48:43 +09:00
Treehugger Robot
ae323c1709 Merge "Build system_ext build.prop with Soong" into main am: 905319607d
Original change: https://android-review.googlesource.com/c/platform/build/+/3204711

Change-Id: Ia558f0b18ff172de529c1b772de2db4d07012daf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 10:15:58 +00:00
Inseob Kim
6dbd7eb601 Build system_ext build.prop with Soong
Bug: 322090587
Test: build and compare system_ext/etc/build.prop
Change-Id: I7b1af2e2b1fe7f107e1540d7b797c7bf489b8a0d
2024-08-05 12:50:01 +09:00
Inseob Kim
57ff7bdd84 Revert "Revert "Revert "Revert "Revert^2 "Add more variables for..." am: 774a6dbbe8
Original change: https://android-review.googlesource.com/c/platform/build/+/3201035

Change-Id: I43c6a91e611a4fb2bec9431714029cbdcee1716b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-01 00:05:07 +00:00
Inseob Kim
774a6dbbe8 Revert "Revert "Revert "Revert "Revert^2 "Add more variables for..."
Revert submission 3200273-revert-3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA-PCKYAVELZP

Reason for revert: fixed breakage with aosp/3200730, verified with ABTD

Reverted changes: /q/submissionid:3200273-revert-3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA-PCKYAVELZP

Change-Id: I19163de97c397b9c171362d221389a1d66a5712a
2024-07-31 02:00:41 +00:00
Liana Kazanova
d23cef7401 Revert "Revert "Revert "Revert^2 "Add more variables for system/..." am: dd3d5c1f3d
Original change: https://android-review.googlesource.com/c/platform/build/+/3200276

Change-Id: Ic1e255edea95c79f470f9ffc2460b1fe04dec4d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-30 23:50:59 +00:00
Liana Kazanova
dd3d5c1f3d Revert "Revert "Revert "Revert^2 "Add more variables for system/..."
Revert submission 3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA

Reason for revert: DroidMonitor: Potential culprit for b/356297315 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA

Change-Id: Ic1c52133c80484b318f1ae72e2fd5b5fe199f9ab
2024-07-30 19:14:30 +00:00
Inseob Kim
f81b3e3f7c Revert "Revert "Revert^2 "Add more variables for system/build.pr..." am: aaf50f6a43
Original change: https://android-review.googlesource.com/c/platform/build/+/3196510

Change-Id: I4c9832cf04226e6c0aa33cfb544c70dc2a805ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-30 04:13:43 +00:00
Inseob Kim
aaf50f6a43 Revert "Revert "Revert^2 "Add more variables for system/build.pr..."
Revert submission 3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ

Reason for revert: fixed with aosp/3196490 and aosp/3196470

Reverted changes: /q/submissionid:3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ

Change-Id: Id2da52a73f9791b3049c3fe60727bfb383180f14
2024-07-25 10:58:33 +00:00
Inseob Kim
7769628658 Merge changes from topic "revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ" into main am: 409209f02c
Original change: https://android-review.googlesource.com/c/platform/build/+/3195816

Change-Id: Id929f5bec806c1206fc06930415fd3c9b2408a18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 10:39:00 +00:00
Pechetty Sravani (xWF)
9a046515db Revert "Revert^2 "Add more variables for system/build.prop migra..."
Revert submission 3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR

Reason for revert: Droidmonitor created revert due to b/355379515. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR

Change-Id: Idaad375a3a34252b85169ee37ac97f1b02670cea
2024-07-25 09:21:09 +00:00
Inseob Kim
2a777529d9 Revert^2 "Add more variables for system/build.prop migration" am: 50061ea370
Original change: https://android-review.googlesource.com/c/platform/build/+/3195641

Change-Id: Idae6960b580dcafc454b9b53448fa5c4cb6ae2a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 07:39:27 +00:00
Inseob Kim
50061ea370 Revert^2 "Add more variables for system/build.prop migration"
2254142ec5

Change-Id: Iec3a7b1e65b551708faa6e4420566bfc9267c601
2024-07-25 03:27:49 +00:00
Inseob Kim
34c796bd52 Merge changes from topic "revert-3184480-system_build_prop_soong-BZIDUTEOOC" into main am: bcacc9c6de
Original change: https://android-review.googlesource.com/c/platform/build/+/3195635

Change-Id: I38212c120d2cff158ab4bf4905d28335392def43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 02:51:14 +00:00
Inseob Kim
2254142ec5 Revert "Add more variables for system/build.prop migration"
Revert submission 3184480-system_build_prop_soong

Reason for revert: breaks ndk and mainline build 

Reverted changes: /q/submissionid:3184480-system_build_prop_soong

Change-Id: I9bea079d476ea28e83dbb356defa646e662ad830
2024-07-25 02:45:53 +00:00
Inseob Kim
6ea1853c9f Add more variables for system/build.prop migration am: 78f9be7a4e
Original change: https://android-review.googlesource.com/c/platform/build/+/3184459

Change-Id: I49792bc34558b477701eee5f4dccdef42b1529d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 02:08:22 +00:00
Inseob Kim
78f9be7a4e Add more variables for system/build.prop migration
Bug: 322090587
Test: build
Change-Id: I499928ee2bdc53e654fd83b5ab5d609a3957ace6
2024-07-24 17:15:59 +09:00
Steven Moreland
b8425a4fa7 Merge "Reland "Consider non-shipping lunch targets to be future."" into main am: 93e0aad03c
Original change: https://android-review.googlesource.com/c/platform/build/+/3140300

Change-Id: I56f0f5c164c084b9a4c7cc076428ed1eaea31792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-26 19:59:29 +00:00
Steven Moreland
93e0aad03c Merge "Reland "Consider non-shipping lunch targets to be future."" into main 2024-06-26 19:56:10 +00:00
Steven Moreland
8907ad66d1 Reland "Consider non-shipping lunch targets to be future."
This reverts commit b5b8777686.

Reason for revert: reverted in b/348090986

Change-Id: I2cc85dc4bdf9ed3dc2fb4ff77d9dffa3c32dda76
2024-06-26 17:18:41 +00:00
Cole Faust
27d7b48607 Merge "Add soong_config_set_bool" into main am: 79d04e4115
Original change: https://android-review.googlesource.com/c/platform/build/+/3141976

Change-Id: If8ea57147371361c7db10b139538fd04b537d78a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:48:35 +00:00
Cole Faust
95ff089b84 Add soong_config_set_bool
To allow typing soong config variables as bools for using in soong
select expressions.

Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: I39496cd2a3366689e3f232ba10353a7d56d8d1ed
2024-06-20 14:51:39 -07:00
Xin Li
c5b3759ccf Merge "Merge 24Q3 (ab/11976889) to aosp-main-future" into aosp-main-future 2024-06-20 20:31:51 +00:00
Xin Li
1a409255f2 Merge 24Q3 (ab/11976889) to aosp-main-future
Bug: 347831320
Merged-In: I23b7f7e8a1b43bbd5f49012c95a130d91098f92a
Change-Id: I72f3cb19133b7bd0e54a0ff7ca64cf70df2da057
2024-06-18 14:21:23 -07:00
Jakub Czapiga
31f6e08fc9 Drop legacy vboot support.
Bug: 291329969
Bug: 347885843
Bug: 347899892
Test: m
Test: CIs
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5071b95a067c9392b7bfa4d95957307ff0ccdcc3)
Merged-In: I5f30f63553cc2670650897e259ba51baf8ced05d
Change-Id: I5f30f63553cc2670650897e259ba51baf8ced05d
2024-06-18 15:40:14 +00:00
Inseob Kim
15961c8523 Add soong extra config file
Soong extra config file contains Makefile variables that Soong itself
doesn't need to know. It will be read by product_config module to
provide Makefile variables to build tools e.g. build.prop.

Bug: 346214955
Test: see output of product_config module
Change-Id: I045b2722ae85a10d33b9e6b832f4cc2d6789e59a
2024-06-17 10:18:14 +09:00
Lance Chang
7c282854f3 Change TARGET_BUILD_APPS_WITH_BUILD_NUMBER to a product variable
This change allows unbundled app builds to embed the build number in the
version name by defining PRODUCT_BUILD_APPS_WITH_BUILD_NUMBER, so that
APK files from a build can be easily identified.

Ignore-AOSP-First: changes in topics with internal-only projects
Test: manual build
Bug: 340311907
Change-Id: If7feda5eec2bc1e54a90b4adae1bd6da19e3ea45
2024-06-10 22:27:42 -07:00
Lance Chang
eda8686794 Add build number if TARGET_BUILD_APPS_WITH_BUILD_NUMBER is defined
This change allows unbundled app builds to embed the build number in the
version name by defining TARGET_BUILD_APPS_WITH_BUILD_NUMBER, so that
APK files from a build can be easily identified.

Ignore-AOSP-First: changes in topics with internal-only projects
Test: manual build
Bug: 340311907
Change-Id: I9a7e4f96f0d92c19d832933b5c68bd6b75ce9ce6
2024-06-09 13:22:58 -07:00
Cole Faust
b20aee1b1e Merge "Remove all VNDK deprecation flags" into main 2024-06-05 19:24:17 +00:00
Steven Moreland
52c2371ae8 Reland "check_elf_file: check prebuilts are aligned"
This reverts commit 411fb17537.

Reason for revert: reland after other targets are fixed b/342466032

Bug: 342466032
Test: build, w/ and w/o checking enabled

Change-Id: I830166faffec781cf6cc4fea47140a60b0a12466
2024-06-04 17:26:12 +00:00
Kiyoung Kim
69f5dbb0d0 Remove all VNDK deprecation flags
VNDK is fully deprecated, so flags to deprecate VNDK is no longer
needed. This change removes all flags deprecates VNDK.

Bug: 330100430
Test: AOSP CF build succeeded
Change-Id: Ifc918a875d7d5bed232165873ee9b0c562841594
2024-05-31 09:52:18 +09:00
Inseob Kim
85b83a90e1 Move sysprop assignments to separate mk file
core/sysprop_config.mk is added to separate code setting
ADDITIONAL_*_PROPERTIES variables. This should be a no-op for now but it
will help migrate build.prop generation to Soong.

Bug: 322090587
Test: compare build.prop files before and after
Change-Id: I57a1ae899865027bcadddc2071fcd2afcf2703bc
2024-05-09 17:38:46 +09:00
Kousik Kumar
fe9aaa23fe Remove deprecated Goma makefiles
Goma is no longer used with android platform builds. Just a minor cleanup.

Bug: n/a
Change-Id: I62844c1d555677006a1022dab4f12bcfd7e55758
2024-05-01 18:14:17 +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
f44951d3af 16k: build: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets
This relands commit 35839ec1a3 and also
includes `PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO` override for several
targets. The latter is required in order to fix failing tests due to
mismatch in the `VSR_VENDOR_API_LEVEL` value between test and device
targets.

Bug: 333124272
Bug: 310232825
Change-Id: I12db4b78b02aa4a58c7355852dc2ff5ae395592c
2024-04-15 21:45:08 +00:00
Vilas Bhat
15e3467d6d Revert^3 "16k: core: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets"
This reverts commit 35839ec1a3.

Reason for revert: CI breakages for 2 targets. Please refer to bug for more details

Bug: 334152807
Change-Id: I0e38583cd3fa57afef432406374ec8d4ddc57e72
2024-04-12 22:20:40 +00:00
Vilas Bhat
d3123d4f62 16k: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO only on Android V targets
This updates the VSR_VENDOR_API_LEVEL for which
TARGET_NO_BIONIC_PAGE_SIZE_MACRO is set to false from < 34 to < 35

Bug: 310232825
Test: lunch <target> && get_build_var TARGET_NO_BIONIC_PAGE_SIZE_MACRO
Change-Id: Ib6b8ba94fe6b2c8b7bbf31fb56e07bd97eb79fc2
2024-04-12 17:23:57 +00:00
Vilas Bhat
35839ec1a3 Revert^2 "16k: core: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets"
This reverts commit 5c2956897c.

Reason for revert: Fixed the breaking tests on `aosp_cf_x86_64` target.

Change-Id: I7179b4615985f4f85b26ebe5ce099ee4899bb415
Test: lunch <target> && get_build_var TARGET_NO_BIONIC_PAGE_SIZE_MACRO
Bug: 310232825
2024-04-11 21:34:08 +00:00
Weilin Wu
5c2956897c Revert "16k: core: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets"
This reverts commit 9014163717.

Reason for revert: DroidMonitor: Potential culprit for Bug 332223093 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: Icc3617d8c80f2417e22205b7305583bfaef64913
2024-04-01 07:01:36 +00:00
Vilas Bhat
9014163717 16k: core: Enable TARGET_NO_BIONIC_PAGE_SIZE_MACRO by default on Android V targets
Enabling TARGET_NO_BIONIC_PAGE_SIZE_MACRO implies those targets no
longer rely on the `PAGE_SIZE` bionic macro. Page size would be queried
at runtime using getpagesize() / sysconf(_SC_PAGE_SIZE).

Test: lunch <target> && get_build_var TARGET_NO_BIONIC_PAGE_SIZE_MACRO
Bug: 310232825
Change-Id: I01291c8626d103a4f3bbc0a659d5843a78a9b24b
2024-03-29 17:50:40 +00:00
Vilas Bhat
d3ad962cdc 16k: core: Remove page size limitation for setting TARGET_NO_BIONIC_PAGE_SIZE_MACRO
TARGET_NO_BIONIC_PAGE_SIZE_MACRO could be enabled regardless of the
value specified by TARGET_MAX_PAGE_SIZE_SUPPORTED and hence, the check
is no longer required.

Test: lunch <target> && get_build_var TARGET_NO_BIONIC_PAGE_SIZE_MACRO
Bug: 310232825

Change-Id: I4da314b803c4d84ac4ac1da691b9c195c2f2fb1d
2024-03-26 15:49:39 +00:00
Vilas Bhat
d4e6add5b0 16k: core: Add defaults for TARGET_MAX_PAGE_SIZE_SUPPORTED
This refactors existing validation logic to do the following:
- Default ELF alignment to 4096 for non-(arm64/x86_64) targets.
- Default ELF alignment to 4096 if VSR_VENDOR_API_LEVEL < 34.

Test: lunch <target> && get_build_var TARGET_MAX_PAGE_SIZE_SUPPORTED
Bug: 310232825
Change-Id: Ia1548d74c9f92b70a80cb65cc6ed35d4c77edcd2
2024-03-25 18:11:39 +00:00
Vilas Bhat
8c85199efe 16k: core: Change default TARGET_MAX_PAGE_SIZE_SUPPORTED to 16384
Changing TARGET_MAX_PAGE_SIZE_SUPPORTED default from 65536 to 16384 as
this would reduce the ELF alignment for files and thereby also
decreasing the padding required. Although increased padding does not
result in increased disk space (due to holes), it increases file
metadata. Reducing ELF alignment also helps reduce page table memory as
it reduces number of memory pages utilized / virtual memory address
mappings.

Test: lunch <target> && get_build_var TARGET_MAX_PAGE_SIZE_SUPPORTED
Bug: 310232825
Change-Id: I7c6b1bb699fec8b8ecf49a0f06a79d89142e3a2b
2024-03-22 20:45:45 +00:00
Cole Faust
d49454acab Remove BPTTOOL variable
This is unused since aosp/2654584

Test: Presubmits
Change-Id: Idf9b17d4d3b59f5a19ff544dd95d740892743303
2024-03-20 18:05:54 -07:00
Treehugger Robot
4e5aa5d0f5 Merge "Remove fs_get_stats." into main 2024-03-14 17:13:26 +00:00
Elliott Hughes
b904c27e12 Remove fs_get_stats.
This was only used by the tarball-building support that was removed
in 2019.

Test: treehugger
Change-Id: I719364699d426d21010c3ab913d12f15128f2538
2024-03-14 15:32:24 +00:00
Inseob Kim
51193b144c Add 202404 to PLATFORM_SEPOLICY_COMPAT_VERSIONS
Bug: 327954176
Test: m selinux_policy
Change-Id: Ic2d628785e8fb2882d16a1920115b6b925d2d4a1
2024-03-11 16:19:33 +09:00
Treehugger Robot
d8c04fd026 Merge "Move setting default BOARD_VNDK_VERSION value" into main am: 9b3d6f91aa
Original change: https://android-review.googlesource.com/c/platform/build/+/2960351

Change-Id: I066fb29a388a0311fc9170dbe10a1c810deef71d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13 13:57:49 +00:00
Inseob Kim
31051a565d Merge "Revert^2 "Use vFRC version as-is for ToT sepolicy version"" into main am: 5fd1645f11
Original change: https://android-review.googlesource.com/c/platform/build/+/2960347

Change-Id: Id99bd029aac84e6fa3c0790bec0488787f19787d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13 13:55:25 +00:00