Commit Graph

84066 Commits

Author SHA1 Message Date
Treehugger Robot
c8c78e961e Merge "Define otacerts_zip module in soong" into main am: 2fb3964e21
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3160437

Change-Id: I8523694c1a3faefc4bb5b1aee5a096220a068c9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-04 23:17:22 +00:00
Treehugger Robot
2fb3964e21 Merge "Define otacerts_zip module in soong" into main 2024-07-04 23:00:05 +00:00
Mårten Kongstad
0cc7e0ccb5 Merge "Revert^2 "Make Lint FlaggedApi violations errors"" into main am: 95561d23b3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3159599

Change-Id: I6a1e26d7b93ccaef7d6cadd51c215c949b1ddc53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-04 13:57:05 +00:00
Mårten Kongstad
95561d23b3 Merge "Revert^2 "Make Lint FlaggedApi violations errors"" into main 2024-07-04 13:02:19 +00:00
Mårten Kongstad
373024d012 Revert^2 "Make Lint FlaggedApi violations errors"
This reverts commit 38813efb53.

Reason for revert: all known Lint violations baselined.

Change-Id: Ic6bf778df563ef6a592427442a9cc6a3d9ef8b51
2024-07-04 11:39:55 +00:00
Justin Yun
635e788274 Define otacerts_zip module in soong
To move the otacerts module from make to soong, define a new module
type otacerts_zip module. This module collects key files from
PRODUCT_DEFAULT_DEV_CERTIFICATE and PRODUCT_EXTRA_OTA_KEYS
(PRODUCT_EXTRA_RECOVERY_KEYS for recovery) to install the zipped file
in etc.
otacerts_zip module is available to recovery to install the
otacerts.zip file in the recovery partition.

Bug: 335364209
Test: Define "PRODUCT_DEFAULT_DEV_CERTIFICATE := \
                 build/make/target/product/security/testkey" and
      m aosp_cf_system_x86_64
Change-Id: Ib5b671e9caef0403c6d9d69bfab29be248d7086c
2024-07-04 15:56:36 +09:00
Treehugger Robot
404caf9295 Merge "Fix build error for gen_build_prop.py" into main am: b6c0bd1ace
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3157119

Change-Id: I65df4789f6deeb0949523d5125790a3d1cf25900
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-04 00:39:02 +00:00
Treehugger Robot
b6c0bd1ace Merge "Fix build error for gen_build_prop.py" into main 2024-07-04 00:33:15 +00:00
Priyanka Advani
ffafa96de0 Merge "Revert "Make Lint FlaggedApi violations errors"" into main am: 58d4898b12
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3159358

Change-Id: Ia55d130405eedf57e0ec62ad5733663098ad415d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-04 00:32:49 +00:00
Priyanka Advani
58d4898b12 Merge "Revert "Make Lint FlaggedApi violations errors"" into main 2024-07-04 00:17:28 +00:00
Priyanka Advani
38813efb53 Revert "Make Lint FlaggedApi violations errors"
Revert submission 3156916-flagged-api-lint-baseline

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

Reverted changes: /q/submissionid:3156916-flagged-api-lint-baseline

Change-Id: I625226c2d2a4b68094a6566d7a9459bd36d935c5
2024-07-03 19:53:55 +00:00
Treehugger Robot
d31c7dd87d Merge "Don't write allowlisted androidx.* libraries to allowed_deps.txt" into aosp-main-future 2024-07-03 17:51:50 +00:00
Treehugger Robot
c427b89ce2 Merge "Install dexpreopt artifacts of SpeedApps in system_other" into main am: b48f55eed5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3148968

Change-Id: I05f1f692cae3f01707836707e04503115d1d0c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 16:32:13 +00:00
Treehugger Robot
b48f55eed5 Merge "Install dexpreopt artifacts of SpeedApps in system_other" into main 2024-07-03 16:13:34 +00:00
Treehugger Robot
b23109b27c Merge "Make Lint FlaggedApi violations errors" into main am: 013e72c8e5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3140777

Change-Id: I0907e62f5f828ef19ad89451c8ceeeaf94004005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 15:53:23 +00:00
Treehugger Robot
013e72c8e5 Merge "Make Lint FlaggedApi violations errors" into main 2024-07-03 15:38:18 +00:00
Alan Viverette
e405334104 Don't write allowlisted androidx.* libraries to allowed_deps.txt
Ignore-AOSP-First: Required for merge conflict resolution
Flag: EXEMPT refactor
Bug: 333398044
Test: croot && packages/modules/common/build/update-apex-allowed-deps.sh
Merged-In: I350ee64bafcd51f69110d880e0de12ae22558fc9
Change-Id: I350ee64bafcd51f69110d880e0de12ae22558fc9
2024-07-03 15:20:12 +00:00
Treehugger Robot
12d63fe0bf [automerger skipped] Merge "Generate file list installed from a filesystem" into main am: 87244ee93e -s ours
am skip reason: Merged-In I8c8f555d57fee90753120f637dc3bc633f276a09 with SHA-1 3c1a5e9d2f is already in history

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

Change-Id: If14655ada20a7e5e1877d3fa3aea264c8937274d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 05:08:32 +00:00
Kiyoung Kim
ad6db45369 [automerger skipped] Generate file list installed from a filesystem am: 99a954d98d -s ours
am skip reason: Merged-In I8c8f555d57fee90753120f637dc3bc633f276a09 with SHA-1 3c1a5e9d2f is already in history

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

Change-Id: I8cc652c1061a311b98fcd0338acaae49683c0c05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 05:08:27 +00:00
Treehugger Robot
87244ee93e Merge "Generate file list installed from a filesystem" into main 2024-07-03 04:48:21 +00:00
Justin Yun
ac4a727793 Fix build error for gen_build_prop.py
Provided undefined constants and imports.

Bug: 346214958
Test: Define "PRODUCT_DEFAULT_DEV_CERTIFICATE := \
                 build/make/target/product/security/testkey" and
      m aosp_cf_system_x86_64
Change-Id: Ic65f059fe87a997a9be695ebf13dfde2d2c6f82c
2024-07-03 13:34:29 +09:00
Jooyung Han
98598e9b93 Merge "Remove apex.use_vndk_as_stable" into main am: ef2143dee8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3156398

Change-Id: Ic5aae7f61390c2b0e0bf8cf9705a704916c96883
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 01:57:32 +00:00
Jooyung Han
ef2143dee8 Merge "Remove apex.use_vndk_as_stable" into main 2024-07-03 01:29:08 +00:00
Aditya Kumar
455cb85dce Merge "Remove -mo-strict-align as it is enabled by default in clang-r522817" into main am: 2c9b95000e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3149038

Change-Id: I6a256a9fb91e037257929d288d1d82a2cdaed9ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 01:18:57 +00:00
Aditya Kumar
2c9b95000e Merge "Remove -mo-strict-align as it is enabled by default in clang-r522817" into main 2024-07-03 00:57:58 +00:00
Treehugger Robot
10e5e26a8b Merge "Use the correct ninja binary for the host in aninja" into main am: da93996abe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3157676

Change-Id: I0567584ea804070517bc3938da0a2fd62d507c56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-02 23:11:29 +00:00
Treehugger Robot
da93996abe Merge "Use the correct ninja binary for the host in aninja" into main 2024-07-02 22:46:51 +00:00
Tomasz Wasilczyk
edaf1e6120 Merge "cc_cmake_snapshot: Allow selecting modules from system and vendor" into main am: 41dfb90ed0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3150917

Change-Id: I494c5ef59ca3a52352008f596dac9adc021855e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-02 22:26:32 +00:00
Tomasz Wasilczyk
41dfb90ed0 Merge "cc_cmake_snapshot: Allow selecting modules from system and vendor" into main 2024-07-02 22:01:19 +00:00
Spandan Das
780a0cfe0a Install dexpreopt artifacts of SpeedApps in system_other
The dexpropt'd files for Speed apps are currently installed next to the
.apk file. This CL modifies the installation path of these dexpreopt
artifacts to /system_other.

Bug: 349083274
Test: for cf_x86_64_phone-trunk_staging-userdebug, verified that
SystemUIGoogle.odex appears in installed-files-system-other.txt and
_not_ installed-files-system-ext.txt

Test: In device boot logs, found the following match
Successfully loaded /data/dalvik-cache/arm64/system_ext@priv-app@SystemUIGoogle@SystemUIGoogle.apk@classes.dex with executable: 0

Change-Id: I5dd6ea7c1291a568ffdc2f4f23aaee4f806b1998
2024-07-02 21:56:05 +00:00
Dan Willemsen
3c68b18f73 Use the correct ninja binary for the host in aninja
Change-Id: I79eb7fb397e9ae623a1cc2e67a472881767656f6
Test: `aninja -h` on Linux & Mac
2024-07-02 21:46:28 +00:00
Zi Wang
8e35f0164d Merge "Use OutputFilesProvider on some android test modules" into main am: 5aec0afe5e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3155936

Change-Id: I553b96620f337359084b3156fbde6b53a3b40f0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-02 19:07:26 +00:00
Zi Wang
5aec0afe5e Merge "Use OutputFilesProvider on some android test modules" into main 2024-07-02 18:50:45 +00:00
Treehugger Robot
06bfdfe203 Merge "AFDO: Do not mutate on disabled modules" into main am: 66b451b8ae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3156719

Change-Id: Ib80308a803819b7547f49dae1143f6acddf43188
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-02 18:07:27 +00:00
Tomasz Wasilczyk
8c61bbafa1 cc_cmake_snapshot: refine link and compile flags am: cd674738c0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3146401

Change-Id: I7c0c43771973178692aea1b5dc3726d2b061f525
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-02 18:07:13 +00:00
Treehugger Robot
66b451b8ae Merge "AFDO: Do not mutate on disabled modules" into main 2024-07-02 18:00:57 +00:00
Tomasz Wasilczyk
d38d14056c cc_cmake_snapshot: Allow selecting modules from system and vendor
Bug: 285204695
Test: m binder_sdk
Change-Id: I47836dcfa74d48f74e3e7cf0293a8eeb9206be4c
2024-07-02 10:43:02 -07:00
Tomasz Wasilczyk
cd674738c0 cc_cmake_snapshot: refine link and compile flags
Also, move some AIDL detection logic to the AIDL library extension

Bug: 341997808
Test: m binder_sdk
Change-Id: I7776d2a967f547b305b0fa3a68dbe8cba5111534
2024-07-02 10:43:02 -07:00
Yi Kong
f885689227 AFDO: Do not mutate on disabled modules
If a module is implicitly disabled due to compile_multilib: "64" on a
32-bit only device, we would insert a dependency to a non-existant AFDO
profile variation.

Test: presubmit
Bug: 350641338
Change-Id: I82851c4bc943405e48f7f35b3484fac2e509bfe5
2024-07-02 17:07:02 +00:00
Jooyung Han
b19a0dd90a Remove apex.use_vndk_as_stable
Since VNDK is gone now, the property has no meaning. Will remove the
property after removing all the references(there're no-op for now).

Bug: 350644693
Test: m
Change-Id: I85637ede5534a3b993ac12656e4aba8d945fec14
2024-07-02 16:47:31 +09:00
Kiyoung Kim
99a954d98d Generate file list installed from a filesystem
Generate file list installed from a filesystem, so it can be compared
with files installed from KATI.

Bug: 346873717
Test: File list generated with aosp_cf_system_x86_64
Change-Id: I8c8f555d57fee90753120f637dc3bc633f276a09
Merged-In: I8c8f555d57fee90753120f637dc3bc633f276a09
2024-07-02 02:22:37 +00:00
Kiyoung Kim
f9c50b623d Merge "Generate file list installed from a filesystem" into aosp-main-future 2024-07-02 02:21:22 +00:00
Spandan Das
58dd481d6b Merge "Revert^2 "Enforce that output files are created in primary ninja execution"" into main am: dd274aba5f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3155937

Change-Id: Id018eaa7d0ae137cb9d256cbb4e407b554a1fb2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-01 23:37:55 +00:00
Zi Wang
b1870a994e Merge "Use OutputFilesProvider on prebuilt_stubs_sources" into main am: 381ee0f77a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3155797

Change-Id: I3e8a3ec2b13c2de57c921823addff00d80dd55e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-01 23:37:35 +00:00
Spandan Das
dd274aba5f Merge "Revert^2 "Enforce that output files are created in primary ninja execution"" into main 2024-07-01 23:28:56 +00:00
Zi Wang
381ee0f77a Merge "Use OutputFilesProvider on prebuilt_stubs_sources" into main 2024-07-01 23:19:21 +00:00
Zi Wang
33192d0efc Merge "Use OutputFilesProvider on buildinfo_prop" into main am: 61f267504c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3155341

Change-Id: I8b5507b583bcb01c5d2d25107c32209b07a52f81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-01 22:07:27 +00:00
Zi Wang
61f267504c Merge "Use OutputFilesProvider on buildinfo_prop" into main 2024-07-01 21:49:21 +00:00
Spandan Das
28a6f19866 Revert^2 "Enforce that output files are created in primary ninja execution"
This reverts commit fddc3dc8d3.

Reason for revert: https://r.android.com/3148741 makes this compatible with art gtests

Change-Id: Ia85c60fdcfa3142fc464a35476170c88c172989c
2024-07-01 21:00:25 +00:00
Tomasz Wasilczyk
88f5315c02 Ignore musl libc depencencies am: 7cec7e6753
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3155340

Change-Id: I98909c2b6159d06ce031ab7080f2d64a347b1f5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-01 19:47:05 +00:00