Commit Graph

84164 Commits

Author SHA1 Message Date
Jooyung Han
041fd84523 Remove apex.generate_hashtree
It's deprecated.

Ignore-AOSP-First: internal branches use this. Will be gone.
Fixes: 184914612
Test: m
Change-Id: I14316a9a288ffc2727bb7033ebded4f4d48b1e6c
2024-07-04 13:06:17 +09:00
Treehugger Robot
3916f700e5 Merge "Fix build error for gen_build_prop.py" into main am: b6c0bd1ace am: 404caf9295
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3157119

Change-Id: I72940b88675af76f9e38dfe82b1b425a62d67659
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-04 00:52:03 +00:00
Priyanka Advani
6c01a80215 Merge "Revert "Make Lint FlaggedApi violations errors"" into main am: 58d4898b12 am: ffafa96de0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3159358

Change-Id: Ib4863fd39c492e28e526d973e5ff69074d50ca67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-04 00:51:47 +00: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
a4ac32ab7b [automerger skipped] Merge "Don't write allowlisted androidx.* libraries to allowed_deps.txt" into aosp-main-future am: d31c7dd87d -s ours
am skip reason: Merged-In I350ee64bafcd51f69110d880e0de12ae22558fc9 with SHA-1 672e45290b is already in history

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

Change-Id: I8bfa2ce8cc6f11fe12a06e246eb75f82908e45b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 18:09:13 +00:00
Alan Viverette
ebfc483ff2 [automerger skipped] Don't write allowlisted androidx.* libraries to allowed_deps.txt am: e405334104 -s ours
am skip reason: Merged-In I350ee64bafcd51f69110d880e0de12ae22558fc9 with SHA-1 672e45290b is already in history

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

Change-Id: Ia4a91f54bb1e94e97d24854507f65c29670909c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 18:09:08 +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
d4e924000c Merge "Install dexpreopt artifacts of SpeedApps in system_other" into main am: b48f55eed5 am: c427b89ce2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3148968

Change-Id: I1826d104ea51cac32d080d210567435cd95afa04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 17:36:32 +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
4e9c2fc6ac Merge "Make Lint FlaggedApi violations errors" into main am: 013e72c8e5 am: b23109b27c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3140777

Change-Id: I8622e4d2cb74990a25fdfae587de7624de878dec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 16:18:38 +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
c9f87fb49b [automerger skipped] Merge "Generate file list installed from a filesystem" into main am: 87244ee93e -s ours am: 12d63fe0bf -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: If29605a0f55bdfcdab820a5763f2f82e78970884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 05:12:43 +00:00
Kiyoung Kim
e02b7ea2f9 [automerger skipped] Generate file list installed from a filesystem am: 99a954d98d -s ours am: ad6db45369 -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: Id426a702c1d8e31f62cd13afa8bd579a578e5958
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 05:12:40 +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
c46b0e428a Merge "Remove apex.use_vndk_as_stable" into main am: ef2143dee8 am: 98598e9b93
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3156398

Change-Id: I1534cfcffba86c7ce884eb1450228a4f8daeee4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 02:18:58 +00: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
Aditya Kumar
13dbf5ed22 Merge "Remove -mo-strict-align as it is enabled by default in clang-r522817" into main am: 2c9b95000e am: 455cb85dce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3149038

Change-Id: Iec87d9ee55281a54c51e813b55dc54871b627103
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-03 01:31:41 +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
95acd73214 Merge "Use the correct ninja binary for the host in aninja" into main am: da93996abe am: 10e5e26a8b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3157676

Change-Id: I93493a56a262ceb88c9682367a46ba3e0c194b05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-02 23:30:06 +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
Tomasz Wasilczyk
9889a27251 Merge "cc_cmake_snapshot: Allow selecting modules from system and vendor" into main am: 41dfb90ed0 am: edaf1e6120
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3150917

Change-Id: Ib2f88458a8def3995c4ef40feab12eef46fb9e45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-02 23:01:15 +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
c1ba4e08b8 Merge "Use OutputFilesProvider on some android test modules" into main am: 5aec0afe5e am: 8e35f0164d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3155936

Change-Id: I7d6bf77ef18a44cc57d89c6f619746f65282fd8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-02 19:21:46 +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
eac146b001 Merge "AFDO: Do not mutate on disabled modules" into main am: 66b451b8ae am: 06bfdfe203
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3156719

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

Change-Id: Ic83903473da74011bb4e15077712651ac93052bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-02 18:25:13 +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