Commit Graph

81513 Commits

Author SHA1 Message Date
Inseob Kim
c56d8743ea Merge "Revert^2 "Remove unused ToTSepolicyVersion"" into main am: 47074225df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2960342

Change-Id: I359475c38a38f77e18800f614b3e5e4fa1ab7454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13 13:55:25 +00:00
Spandan Das
2dc86ebd3e Merge "Restrict verify_overlaps to pre S modules" into main 2024-02-13 10:53:23 +00:00
Jihoon Kang
a0ccab683b Merge "Add environment variable UNBUNDLED_BUILD_TARGET_SDK_WITH_DESSERT_SHA" into main 2024-02-13 04:27:21 +00:00
Inseob Kim
47074225df Merge "Revert^2 "Remove unused ToTSepolicyVersion"" into main 2024-02-13 04:02:35 +00:00
Inseob Kim
10af6edc52 Skip passing "--product default" to aapt2
Because
1) it has no effect.
2) it will simplify build commands, which will minimize differences
   among targets using generate_product_characteristics_rro

Bug: 322932641
Test: TH
Change-Id: I16afae597038da7489989483f8c926916d207df5
2024-02-13 12:56:46 +09:00
Anas Sulaiman
2cde25dec8 Merge "Fix non-deterministic output for merge_zips" into main am: 64f5b207eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2955232

Change-Id: I7914893d4abb66d459fa4a6af544923f93db450f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13 03:10:47 +00:00
Spandan Das
38c64f62cf Restrict verify_overlaps to pre S modules
The runtime in S and above does not have the same constraints that
require the hiddenapi flags to be generated in a monolithic manner.
This CL restricts the verify_overlaps to pre S modules. This will
filter out hiddenapi signature discrepancies that do not require
any action.

Test: verify_overlaps diff with this change https://diff.googleplex.com/#key=xxB0ky93hZRn
Test: presubmits
Bug: 313672880

Change-Id: Ie626a6779fc924563bec90b6c1ab0c7e8b4b23c2
2024-02-13 02:33:12 +00:00
Anas Sulaiman
64f5b207eb Merge "Fix non-deterministic output for merge_zips" into main 2024-02-13 02:20:53 +00:00
Inseob Kim
dae1375433 Revert^2 "Remove unused ToTSepolicyVersion"
a1448e072e

Change-Id: I728d0633718669fb57877e7440dedf49ab980a00
2024-02-13 02:19:24 +00:00
Kiyoung Kim
5a44f16946 Merge "Do not dump BOARD_VNDK_VERSION" into main am: 997951dd96
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2952246

Change-Id: I297dbda73534a4b600c905ea63dd77caa74a8057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13 01:24:47 +00:00
Kiyoung Kim
997951dd96 Merge "Do not dump BOARD_VNDK_VERSION" into main 2024-02-13 00:51:53 +00:00
Treehugger Robot
485ca86b31 Merge "[Ravenwood] Install transitive JNI libraries too" into main am: c521446153
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2956237

Change-Id: Ic47b8d8812223fca5bfd45871a586b8b39af9b89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-12 23:20:56 +00:00
Treehugger Robot
c521446153 Merge "[Ravenwood] Install transitive JNI libraries too" into main 2024-02-12 22:34:39 +00:00
Anas Sulaiman
437e9470c0 Fix non-deterministic output for merge_zips
A map iteration was causing a non-deterministic order
in output entries. The default behaviour is to preserve
the same order of the input zips, which is necessary
to ensure a deterministic output for deterministic inputs.

Bug: b/322788229
Test: Ran a couple of builds and confirmed no cache misses from
the output of merge_zips.

Change-Id: I3217e6887ab108d213a290b59da5b33d51b8241f
2024-02-12 22:00:55 +00:00
Jihoon Kang
842b999a53 Add environment variable UNBUNDLED_BUILD_TARGET_SDK_WITH_DESSERT_SHA
UNBUNDLED_BUILD_TARGET_SDK_WITH_DESSERT_SHA enables user to specify
${codename}.${sha} as min_sdk_version and target_sdk_version in order to
support mainline train building into android build.

Test: TH
Bug: 295905124
Change-Id: I032d464aaa7314520f98b8eafa53d962940075ce
2024-02-12 21:12:58 +00:00
Colin Cross
6001a85596 Merge changes from topic "revert-2952265-revert-2925209-KVPWEBRQHT-BBCOVJBOVF" into main am: a82de712b3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2952969

Change-Id: I967620a4146acc414ad68c90839ad95a19431722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-12 20:15:58 +00:00
Colin Cross
a82de712b3 Merge changes from topic "revert-2952265-revert-2925209-KVPWEBRQHT-BBCOVJBOVF" into main
* changes:
  Remove fdoProfileMutator
  Convert AFDO mutators to TransitionMutator
2024-02-12 19:31:00 +00:00
Ivan Lozano
357433ae73 rust: Re-enable host address sanitizer.
Our toolchain supports a flag "-Z external-clangrt=true" which prevents
rustc from emitting a missing dependency to librust-dev_rt. Instead, we
link in libclang_rt.

Bug: 304507701
Bug: 324826914
Test: SANITIZE_HOST=address m aconfig
Change-Id: I8020c550b7a922c80620f61c22e01848a4f4a349
2024-02-12 14:16:26 -05:00
Yu Liu
dec46bc823 Merge "Only link the profile extras lib for device variant." into main am: b882375fe0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746035

Change-Id: Ic2aa2a307fa1bb992a94df8e8d26539761ae51e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-12 18:31:20 +00:00
Yu Liu
b882375fe0 Merge "Only link the profile extras lib for device variant." into main 2024-02-12 18:12:14 +00:00
Stephen Hines
ebe499b6aa Merge "Allow clippy::unnecessary_fallible_conversions" into main am: 833a00e36e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2957217

Change-Id: I2b82f3964512d45444ee57b025624709be00c8ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-12 18:00:08 +00:00
Stephen Hines
833a00e36e Merge "Allow clippy::unnecessary_fallible_conversions" into main 2024-02-12 17:32:27 +00:00
Nishant Panwar
0ce946587b Add SDK library framework-pdf-v in MediaProvider
SDK library for pdf related bootclasspath classes that were part of the non-updatable API before V, and were moved to the module in V. Other pdf related bootclasspath classes in mediaprovider should go to framework-pdf.

Bug: b/324667310
Test: presubmit and m
Change-Id: I41eb561edbade9609c58ad8ee3acdcc9bf03c0c5
2024-02-11 09:37:49 +00:00
Sean Kim
2da24fbf11 Merge "Enable -Wambiguous-reversed-operator" into main am: 1c9213d89f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2954445

Change-Id: I1e4d82994f94985bac04c5151fcce2546011d827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-10 04:41:34 +00:00
Sean Kim
1c9213d89f Merge "Enable -Wambiguous-reversed-operator" into main 2024-02-10 03:54:46 +00:00
Treehugger Robot
557333303d Merge "Add --depth and --reverse to soongdbg deps" into main am: eb5a74cebe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2957000

Change-Id: I149fb812d3480c8fac6346b79233dbf36fc5dc08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-10 02:58:07 +00:00
Treehugger Robot
eb5a74cebe Merge "Add --depth and --reverse to soongdbg deps" into main 2024-02-10 02:40:09 +00:00
Treehugger Robot
cb40780458 Merge "Add option to show dependency tags in soongdbg" into main am: 1b450e9f0c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2957220

Change-Id: I3ecc5a4f2028a8bfa76dbb883ecbb133142c2917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-10 02:34:48 +00:00
Treehugger Robot
f5d815cd5f Merge "Fix soongdbg deps" into main am: 0e1f729d08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2957216

Change-Id: Ie189b5564a76e9157ae9fb24cedd7e814cb28c49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-10 02:34:36 +00:00
Treehugger Robot
1b450e9f0c Merge "Add option to show dependency tags in soongdbg" into main 2024-02-10 02:15:30 +00:00
Treehugger Robot
0e1f729d08 Merge "Fix soongdbg deps" into main 2024-02-10 01:57:29 +00:00
Joe Onorato
2816c97d23 Add --depth and --reverse to soongdbg deps
Test: use the flags
Change-Id: If7edacae672eca974978cc211d6e385d5038bcc2
2024-02-09 17:11:46 -08:00
Treehugger Robot
a904ba5e6f Merge changes I3c6eb7fc,Idf5ee9a3 into main am: 5b636d3144
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2956236

Change-Id: I19b5f4d1f35ce45dca1410f5fdba0d9c5460334d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-10 00:50:32 +00:00
Makoto Onuki
2ca8427124 [Ravenwood] Install transitive JNI libraries too
Ignore-AOSP-First: Will cherry-pick later.
Bug: 318393625
Bug: 323931246

Test: run-ravenwood-tests.sh
Test: (with local change) atest RavenwoodBivalentTest_device RavenwoodMockitoTest_device
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:55c035761c8b7b758d710ed5eeb9192525677057)
Merged-In: Ie0f6bbf1aa6252d415c53cfc19178f0986cc57f1

Change-Id: Ie0f6bbf1aa6252d415c53cfc19178f0986cc57f1
2024-02-09 16:45:43 -08:00
Joe Onorato
04b63b1870 Add option to show dependency tags in soongdbg
Test: soongdbg between --svg ~/Desktop/foo.svg --deptags android.content.pm.flags-aconfig PackageInstaller
Change-Id: I00786ff982ecff71e6f3cdc8d72bba5f23a093b5
2024-02-09 16:35:56 -08:00
Treehugger Robot
5b636d3144 Merge changes I3c6eb7fc,Idf5ee9a3 into main
* changes:
  Add soongdbg json to print the json for a module
  Add --svg and --dot args to soongdbg so you don't have to run graphviz by hand
2024-02-10 00:35:26 +00:00
Treehugger Robot
fee8b05774 Merge "Add --label argument to soongdbg to call jq for metadata" into main am: 865e70c2fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2956234

Change-Id: Iafe23faadf41b02505626c9f276f43b3525aa430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-10 00:28:57 +00:00
Treehugger Robot
865e70c2fe Merge "Add --label argument to soongdbg to call jq for metadata" into main 2024-02-09 23:58:13 +00:00
Stephen Hines
f8ffb6d4c2 Allow clippy::unnecessary_fallible_conversions
This lint is part of Rust 1.75.0, but has a lot of problems with FFI
data types that change size between 32-bit and 64-bit targets. This
makes the lint check far less useful, so we are just globally
suppressing it for now.

Bug: http://b/321303117
Test: m
Change-Id: I39531c961a26f533451d73b025caca02e593a269
2024-02-09 15:36:35 -08:00
Colin Cross
767ad532af Merge "Fix TestAfdoDeps for darwin" into main am: 09e1e8d1fb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2954443

Change-Id: I365487324b8e73e60202c6a485cd3e2fc66c5be1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-09 23:26:23 +00:00
Pirama Arumuga Nainar
7493929ff2 Enable -Wambiguous-reversed-operator
Bug: http://b/323152930
Bug: http://b/324323434

The ambiguity in frameworks/av/media/codec2 is resolved.

Test: build partner branch, and presubmit
Change-Id: Ie1aa0b6c965b1a9076333d7d25fd9f9664467a31
2024-02-09 22:45:58 +00:00
Colin Cross
09e1e8d1fb Merge "Fix TestAfdoDeps for darwin" into main 2024-02-09 22:41:46 +00:00
Joe Onorato
b3ffad1992 Fix soongdbg deps
Test: soongdbg deps framework-platform-compat-config
Change-Id: I8a49e0f4efbd0ef68d5ae7fb403166c046112322
2024-02-09 14:39:45 -08:00
Joe Onorato
12e2cf72df Add soongdbg json to print the json for a module
Makes it easier to figure out your jq.

Test: soongdbg json SystemUI | jq -r '.source_file + ":" + (.source_line | tostring) + ": " + .name'
Change-Id: I3c6eb7fcefa5a27101ea49ddf2dcf59ab24f804b
2024-02-09 13:50:35 -08:00
Colin Cross
3513fb17cd Remove fdoProfileMutator
Add the dependency on the fdo_profile module in afdoTransitionMutator
and read the provider in GenerateAndroidBuildActions.

This relands Ied8fd7b52d5694a3691652318e87b8fe14dda126 with a fix
to use the correct LTO ldflag when an afdo variant doesn't have a
profile.

Bug: 319288033
Bug: 324141705
Test: afdo_test.go
Change-Id: I024ca316cfb565b5fb0251793f05a54ce16cc1cb
2024-02-09 13:49:02 -08:00
Colin Cross
e00614ecba Fix TestAfdoDeps for darwin
LTO does not set the -import-instr-limit flag when building for
darwin, don't test it on darwin host modules.

Test: afdo_test.go
Change-Id: I83f77006a875f8b0a6af9ae11eb3bad88b0681b1
2024-02-09 12:22:13 -08:00
Treehugger Robot
72d4bc1025 Merge "Remove macros that the Linux host no longer needs." into main am: c7c666a354
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2955865

Change-Id: Ic93a2ae1b4c388f7f545872f5c9dc5d990060d84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-09 20:01:16 +00:00
Colin Cross
c9b0abeec0 Merge changes I255fcbb8,I3ed4ce03 into main am: 545ebf0c40
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2953966

Change-Id: Iddfbebb541f28892312940f8b58a5698c5ff2bae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-09 19:59:27 +00:00
Joe Onorato
be952da370 Add --svg and --dot args to soongdbg so you don't have to run graphviz by hand
Test: soongdbg between --svg ~/Desktop/foo.svg --label '"sdk_version="+.properties.Sdk_version' MODULE_1 MODULE_2
Change-Id: Idf5ee9a3ca2dc4b1fd3aa941fe641225336438fc
2024-02-09 11:43:57 -08:00
Treehugger Robot
c7c666a354 Merge "Remove macros that the Linux host no longer needs." into main 2024-02-09 19:39:06 +00:00