Commit Graph

8450 Commits

Author SHA1 Message Date
mrziwang
069da0c1e3 Use OutputFilesProvider on global_compat_config am: 9e7127ff3b am: bc6361607f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3137576

Change-Id: Ie07160f7a260f66169bc25bc7f7cdeac2392a88c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 18:16:43 +00:00
mrziwang
9e7127ff3b Use OutputFilesProvider on global_compat_config
In the context of incremental soong, the output files
inter-module-communication will be through OutputFilesProvider.
The OutputFileProducer interface will be deprecated.

Test: CI
Bug: 339477385
Change-Id: I6deb4a005876848f28a5b823a712d9eea33a44e6
2024-06-20 16:20:06 +00:00
Paul Duffin
4ae37802ea Merge "Support passing multiple --migrate-nullness option for java_api_library" into main am: 94811f3031 am: bda26557b7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3137213

Change-Id: I9eede13adcf6aee2b62fb95d3893b83195cc5557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-19 10:29:00 +00:00
Paul Duffin
94811f3031 Merge "Support passing multiple --migrate-nullness option for java_api_library" into main 2024-06-19 09:48:09 +00:00
Treehugger Robot
3cd54b6846 Merge "Use BaseApexName to generate permission file for sdk library" into main am: c0cbb491d5 am: eab0a4e579
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3137737

Change-Id: I3fcab47c1cfbf10f21cb8a9008e0f42cad792dd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-19 05:14:58 +00:00
Treehugger Robot
c0cbb491d5 Merge "Use BaseApexName to generate permission file for sdk library" into main 2024-06-19 04:29:18 +00:00
Spandan Das
33bbeb243f Use BaseApexName to generate permission file for sdk library
Permissions of apex variants of shared java sdk libraries should use the
base apex name (com.android.foo) and not the override apex name
(com.mycompany.android.foo). The override apex name started being used
when separate variants were created for override apex transitive deps
(https://r.android.com/3083813)

Bug: 346486531
Test: m com.google.android.ipsec
Test: verified that
out/target/product/<product>/apex/com.google.android.ipsec/etc/permissions/android.net.ipsec.ike.xml
contains /apex/com.androiqd.ipsec/javalib/android.net.ipsec.ike.jar #
previously it contained com.google.android.ipsec

Test: https://android-build.corp.google.com/builds/abtd/run/L59900030004679761
Change-Id: I863170d78efa017bef5e4ece3b1471f74ba84b0c
2024-06-19 04:27:43 +00:00
Wei Li
6430135602 Implement Module interface function FilesToInstall in platform_compat_config modules. am: 603331542f am: 79ab67af6c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3137577

Change-Id: I93aa4d848047e6ddb1bb0eafd3e68403e711579a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-19 02:05:32 +00:00
Wei Li
603331542f Implement Module interface function FilesToInstall in platform_compat_config modules.
Bug: 324465531
Test: CIs
Change-Id: Idf24c987ad3fafb13956712c14bcb9329673e923
2024-06-18 16:38:31 -07:00
Cole Faust
1e83ef2b48 Merge "Make required a configurable property" into main am: ecdb25e674 am: e66ed453a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3132361

Change-Id: I2347ef8a3c9768c81d3bc95f226783477bf5f5ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-18 18:40:54 +00:00
Cole Faust
ecdb25e674 Merge "Make required a configurable property" into main 2024-06-18 18:05:41 +00:00
Paul Duffin
1b1eb9b3af Support passing multiple --migrate-nullness option for java_api_library
Bug: 347751326
Test: m droid
Change-Id: I7702021348004b5f6d686d71ee566c5589dbc4f5
2024-06-18 18:17:39 +01:00
Cole Faust
43ddd08bd2 Make required a configurable property
So that users can use select statements with it.

Fixes: 347605145
Bug: 342006386
Test: m nothing --no-skip-soong-tests
Change-Id: Ica0ca6d1725b000b3748c0293e5a9f9b38ed87f9
2024-06-17 12:32:40 -07:00
Treehugger Robot
68bea7c213 Merge "Propagate flags_packages to static reverse dependencies" into main am: 541be507f2 am: 70a86396a4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3132174

Change-Id: Ia031be79b4cd5b81942161afbb08f6db4a843001
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-17 19:11:54 +00:00
Xin Li
f9fc13dd78 Merge "Merge Android 14 QPR3 to AOSP main" into main 2024-06-17 18:51:33 +00:00
Treehugger Robot
70a86396a4 Merge "Propagate flags_packages to static reverse dependencies" into main am: 541be507f2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3132174

Change-Id: I8ad6d03cdd0d2c39fa93411eecfcf6a1b0cc02d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-17 18:51:33 +00:00
Treehugger Robot
541be507f2 Merge "Propagate flags_packages to static reverse dependencies" into main 2024-06-17 18:21:26 +00:00
Jihoon Kang
9aef777826 Propagate flags_packages to static reverse dependencies
flags_packages property was added to supports flagging the manifest
files. The listed names of `aconfig_declarations` modules are passed to
aapt2. However, this is currently scoped to the module level, and is not
propagated to the reverse dependencies. In other words, if the manifest
is flagged with `featureFlag` property, all of the reverse dependency of
the android_app/android_library should specify `flags_packages` property
in the bp module definition, leading to huge toil for the users.

In order to resolve such inconvenience, this change modifies the build
rules of android_app,android_library and runtime_resource_overlay such
that flags_packages of the static dependencies are collected.

Test: Patch ag/27816261 && m Settings --no-skip-soong-tests
Bug: 347289274
Change-Id: I4c3855541dd09cb72293515eb2626eaf4ae8c0df
2024-06-17 17:18:37 +00:00
Treehugger Robot
573dfafbc9 Merge "Add DistForGoal "droidcore" for merged_compat_config.xml" into main am: 7f9441175f am: 057f741afb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3119311

Change-Id: I79bc808324e7e3566e9c5add0274f2e0117e6956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-17 03:20:00 +00:00
Treehugger Robot
057f741afb Merge "Add DistForGoal "droidcore" for merged_compat_config.xml" into main am: 7f9441175f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3119311

Change-Id: Ie75755c350aa93d6e47bda8720a5314f8e2ff440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-17 03:13:02 +00:00
Treehugger Robot
7f9441175f Merge "Add DistForGoal "droidcore" for merged_compat_config.xml" into main 2024-06-17 03:05:13 +00:00
PODISHETTY KUMAR
065f23644e Merge "Revert "Pass --non-updatable-system flag to aapt2 when versionCode is unspecified"" into main am: fc7677874a am: 58d5327fbb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3133475

Change-Id: I6c94ea52af25f801b11b0de72a92e5ccb2214530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 13:43:30 +00:00
PODISHETTY KUMAR
58d5327fbb Merge "Revert "Pass --non-updatable-system flag to aapt2 when versionCode is unspecified"" into main am: fc7677874a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3133475

Change-Id: I03a00bfb541769e6aa877a184ce7efa2a03d0f59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 13:38:03 +00:00
PODISHETTY KUMAR
fc7677874a Merge "Revert "Pass --non-updatable-system flag to aapt2 when versionCode is unspecified"" into main 2024-06-14 13:30:06 +00:00
PODISHETTY KUMAR
0b6d6fe9b2 Revert "Pass --non-updatable-system flag to aapt2 when versionCode is unspecified"
This reverts commit ce320f86a0.

Reason for revert: <Dorid monitor: Likely culprit for b/347143262  - 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: I70eabe014acc6feb123f28ac487f7d7d39e9fb6b
2024-06-14 07:32:43 +00:00
Treehugger Robot
34be43abf9 Merge "Pass --non-updatable-system flag to aapt2 when versionCode is unspecified" into main am: 0ef709565e am: 27c00a8bd2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3076227

Change-Id: Id3ff81abfb8448f0e42dc44c7d06c1e75c9dab2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 03:43:32 +00:00
Treehugger Robot
27c00a8bd2 Merge "Pass --non-updatable-system flag to aapt2 when versionCode is unspecified" into main am: 0ef709565e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3076227

Change-Id: I3b90331dc154b29292a9fcf72caf70458eaff233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 03:38:01 +00:00
Treehugger Robot
0ef709565e Merge "Pass --non-updatable-system flag to aapt2 when versionCode is unspecified" into main 2024-06-14 03:36:09 +00:00
Treehugger Robot
8806166b1d Merge "release_config: various cleanup" into main am: 000fe5ac5d am: 4c8f885b84
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3129154

Change-Id: I6fa7afca689c54c2f95e8c65c026da78633a5591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 01:59:09 +00:00
Treehugger Robot
4c8f885b84 Merge "release_config: various cleanup" into main am: 000fe5ac5d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3129154

Change-Id: Iddd2935b353fdfb8a22fccdbe5aa56c6cc17496d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 01:51:17 +00:00
Herbert Xue
67a41bca27 Add DistForGoal "droidcore" for merged_compat_config.xml
Convert the tools/platform-compat/Android.mk into soong build.

Bug: 344489076
Test: m dist
Change-Id: I1e5a744af0005b913d9831d939465af1e2cf825e
2024-06-14 09:47:39 +08:00
Treehugger Robot
000fe5ac5d Merge "release_config: various cleanup" into main 2024-06-14 01:46:45 +00:00
Treehugger Robot
e18a1b66a4 Merge "Call PackageFile for dexpreopt files of APEX bundles." into main am: 9034af498e am: 0adcd9aefa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3128073

Change-Id: I967af1f331806ab22e9ba9ddd4481fc630f7180e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 21:58:43 +00:00
Treehugger Robot
0adcd9aefa Merge "Call PackageFile for dexpreopt files of APEX bundles." into main am: 9034af498e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3128073

Change-Id: I40cce87cc466de96df45e05c9a6cf7b073725ec8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 21:49:51 +00:00
LaMont Jones
09721868db release_config: various cleanup
- move WriteMakefile to release_config.go
- use slices.Sort instead of slices.SortFunc where applicable.
- improve error message when inheriting an invalid release config

Bug: None
Test: manual
Change-Id: Id959ddccc75fad912518d5cce8d14da506e0bbea
2024-06-13 09:18:03 -07:00
Justin Yun
613bdc5b64 Call PackageFile for dexpreopt files of APEX bundles.
Soong generates AndroidMk modules and Make installs the required
dexpreopt files for APEX bundles. This dependency is not tracked by
the soong and missing from the soong filesystem.
Call PackageFile for the dexpreopt files of APEX bundles to install
the files in the soong-built system image.

Bug: 346439786
Test: lunch aosp_cf_x86_64_phone-trunk_staging-userdebug \
      && m aosp_cf_system_x86_64
Change-Id: I6af4afe5b3183c89bf687ac779007b87e1d7e948
2024-06-13 12:37:04 +09:00
Justin Yun
c1a4ff3726 Call PackageFile for dexpreopt files am: 22c8aca893 am: e024ec0ba1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3110884

Change-Id: Ibe89fbf2667e6f2b2294e3a70e89816c93b5d401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 02:44:03 +00:00
Justin Yun
e024ec0ba1 Call PackageFile for dexpreopt files am: 22c8aca893
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3110884

Change-Id: I0ecc092ec4dacfd90b67ccdd0d213021c951d2c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 02:36:00 +00:00
Justin Yun
22c8aca893 Call PackageFile for dexpreopt files
Dexpreopt files use RuleBuilder.Install() that installs the file from
Make. By calling PackageFile, this information is also shared to
soong PackagingSpec.

Bug: 339314890
Test: See if .prof, .bprof, and vdex files are installed with
      "m aosp_cf_system_x86_64"

Change-Id: I42167603ecfd4334e4f35602bdf03a21846fc798
2024-06-13 09:04:42 +09:00
Spandan Das
94ccba9f0e Remove unused dexpreopt install path function am: 8a296baab8 am: 02ff4f972f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3128899

Change-Id: I0bbbe8bc1b20be1501efe4e58845ba8f1f2769a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 23:12:08 +00:00
Spandan Das
02ff4f972f Remove unused dexpreopt install path function am: 8a296baab8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3128899

Change-Id: Ief5bdd7f8651d4a6850c46f5194ae5fc68da8c61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 22:52:42 +00:00
Spandan Das
8a296baab8 Remove unused dexpreopt install path function
`odexOnSystemOther` (presumably) returns a boolean indicating whether
.odex/.vdex files should be installed in system_other.img. The
installation location logic is now colocated in build/soong/dexpreopt
package, so we can delete this unused function.

Test: go build ./java
Change-Id: Ibd1a3a0b945f8d7953baad05cbaf65cb58b5a05a
2024-06-12 21:17:29 +00:00
Jihoon Kang
ce320f86a0 Pass --non-updatable-system flag to aapt2 when versionCode is unspecified
This change modifies the flags passed to aapt2 when generating the APKs.
Currently, the version code of the platform sdk version is passed to
aapt2 when the bp module definition does not explicitly specify the
`--version-code` flag in "aaptflags" parameter. This change modifies
such behavior so that the newly introduced `--non-updatable-system` flag
is passed instead of implicitly passing the `--version-code`.

If "versionCode" is explicitly specified in the app manifest, the
`--non-updatable-system` flag is overriden and is a no-op. This way, the
build continues to stay agnostic to the content of the manifest files.

This flag is not passed for build actions of android_test modules, as
test targets do not set `versionCode`.

Test: m nothing --no-skip-soong-tests &&  manually inspect aapt2 build rules
Bug: 311724570
Change-Id: Ie3e50506d90da1d28b8039e29d76859b1927b5e2
2024-06-12 21:06:36 +00:00
Spandan Das
655a7310d3 Merge "Fix missing missing (min|max)_sdk_version in bootclasspath.pb" into main am: a551b011d0 am: 7e14b86de1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3128893

Change-Id: I014d3aa9cd2723281a821480ab903ad50d656ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 19:08:04 +00:00
Spandan Das
7e14b86de1 Merge "Fix missing missing (min|max)_sdk_version in bootclasspath.pb" into main am: a551b011d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3128893

Change-Id: I53df669f35a362252af9825b9f9b37ed09b0e982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 18:52:33 +00:00
Spandan Das
a551b011d0 Merge "Fix missing missing (min|max)_sdk_version in bootclasspath.pb" into main 2024-06-12 18:21:33 +00:00
Spandan Das
306804fe41 Fix missing missing (min|max)_sdk_version in bootclasspath.pb
bootclasspath.pb.textproto of an apex contains
min_sdk_version/max_sdk_version information of its exported libraries.
It is populated using the stateful minSdkVersion/maxSdkVersion
properties of the SdkLibrary module. These were previously indirectly
populated by invoking `module.Library.GenerateAndroidBuildActions(ctx)`,
which has been removed https://r.android.com/3079425.

This CL updates the implementation to use `MinSdkVersion(ctx)` and
`MaxSdkVersion(ctx)` to get the appropriate values directly and not rely
on GenerateAndroidBuildActions.

Bug: 345621958
Test: cat out/soong/.intermediates/packages/providers/MediaProvider/apex/com.android.mediaprovider-bootclasspath-fragment/android_common_apex30/c49cac19acc21350e0f3590de64d2f7f/bootclasspath.pb.textproto
jars {
path: "/apex/com.android.mediaprovider/javalib/framework-mediaprovider.jar"
classpath: BOOTCLASSPATH
min_sdk_version: "30"
max_sdk_version: ""
}
jars {
path: "/apex/com.android.mediaprovider/javalib/framework-pdf.jar"
classpath: BOOTCLASSPATH
min_sdk_version: "30"
max_sdk_version: ""
}
jars {
path: "/apex/com.android.mediaprovider/javalib/framework-pdf-v.jar"
classpath: BOOTCLASSPATH
min_sdk_version: "34"
max_sdk_version: ""
}
// min_sdk_version values were empty previously

Change-Id: Ia547747b16d255c1a093deee96a1abb61fd47dff
2024-06-12 17:12:56 +00:00
Sam Saccone
aced8afc29 Merge "Only generate kythe xrefs on the primary module" into main am: 6ace4cf906 am: 695908cf6d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3126514

Change-Id: I8b5a24640daff1a5ad620a19379cb3a762b35223
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11 23:32:59 +00:00
Zi Wang
1b8e0b1e08 [conflict] Merge "PrebuildEtcModule no longer implements OutputFiles method" into main am: 3125b75d5d am: 05ae2e9d35
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/27791354

Change-Id: Ic054c0a0c4edbeb5b8afd395b975bd731724cc18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11 23:32:21 +00:00
Sam Saccone
695908cf6d Merge "Only generate kythe xrefs on the primary module" into main am: 6ace4cf906
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3126514

Change-Id: Id836a095e7f3c3f22fca1ed470b832da6677fb59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11 23:17:50 +00:00