Commit Graph

81567 Commits

Author SHA1 Message Date
Treehugger Robot
e08e32b45a Merge "Support new property "arch_dpi" for android_import" into main am: 8bf3013844 am: a948adc496
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2967069

Change-Id: Ib498f26d7c63d9ec3ab209bad7dac75c61afb2f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-27 04:07:27 +00:00
Treehugger Robot
a948adc496 Merge "Support new property "arch_dpi" for android_import" into main am: 8bf3013844
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2967069

Change-Id: I0eb96ab1d45a47c4a67d4fef7f79d813846a6441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-27 03:26:27 +00:00
Treehugger Robot
8bf3013844 Merge "Support new property "arch_dpi" for android_import" into main 2024-02-27 02:56:45 +00:00
Spandan Das
552016475b Ignore prebuilt apex_contributions in coverage builds am: bffd7fbaba am: a0aa5e030b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2976971

Change-Id: I15fb1a9ffd7db6da67c09c8aa335a25dc8f5840d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-26 15:57:12 +00:00
Spandan Das
a0aa5e030b Ignore prebuilt apex_contributions in coverage builds am: bffd7fbaba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2976971

Change-Id: Ieba81fa75cec4a38159c16befa1d84c0df12aabc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-26 15:16:06 +00:00
Spandan Das
bffd7fbaba Ignore prebuilt apex_contributions in coverage builds
This CL unsets the prebuilt contents of a selected apex_contribution
in coverage builds. The effect of this will be that mainline modules
will be built from source with the following in coverage builds
1. Instrumentation turned on
2. RELEASE_ACONFIG_VALUE_SETS for that release config

Test: Added a unit test
Test: lunch cf_x86_64_phone-next-userdebug && EMMA_INSTRUMENT=true m nothing (with ag/26298763)
Bug: 325666427
Change-Id: Ic4e1f0612072377261602842dfd303c064095035
2024-02-26 10:07:45 +00:00
Mårten Kongstad
0842a5508c Merge "Include all_aconfig_declarations in droid dist" into main am: 50bfc34894 am: 0091bf0d2b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2973436

Change-Id: I3962c44b812d36e0aa41d81086d0a13761589455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-26 08:36:44 +00:00
Mårten Kongstad
0091bf0d2b Merge "Include all_aconfig_declarations in droid dist" into main am: 50bfc34894
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2973436

Change-Id: I5706e69be381c4ff41cc49712da01ce28f98323b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-26 07:56:29 +00:00
Mårten Kongstad
50bfc34894 Merge "Include all_aconfig_declarations in droid dist" into main 2024-02-26 07:12:36 +00:00
Herbert Xue
04354ae88b Support new property "arch_dpi" for android_import
Support the feature with new property combined with architecture and dpi
resolution.

Bug: 319381869
Test: go test -run TestAndroidAppImport_ArchVariants
Change-Id: Ib43cbae8868fc35701e6666867b2325f5abbb2c7
2024-02-26 10:46:18 +08:00
Yi Kong
059b1da5ce bindgen: set -Wno-unknown-warning-option flag by default am: 52e5e6b1a7 am: 6d48d7e1bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2975255

Change-Id: I36b6c57967d7b6c49b584c95ddf3d1deb30ca8b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-25 09:09:40 +00:00
Yi Kong
6d48d7e1bc bindgen: set -Wno-unknown-warning-option flag by default am: 52e5e6b1a7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2975255

Change-Id: I7896590677cea14294e8eb1fdfe6c49067ea4028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-25 08:29:44 +00:00
Yi Kong
52e5e6b1a7 bindgen: set -Wno-unknown-warning-option flag by default
Test: presubmit
Change-Id: Id8547c0b3263f4e3b060f8b0fce2aef8a494b1b2
2024-02-25 12:49:41 +08:00
Mårten Kongstad
c61353222c Include all_aconfig_declarations in droid dist
Include all_aconfig_declarations in the droid dist directory
(identically to how it is already included in the sdk dist).

For local builds, `printflags` is still the recommended way to read
all_aconfig_declarations; the dist-ed files are intended as a way to
inspect remote builds, such as CI builds.

Bug: 324281288
Test: lunch aosp_oriole-trunk-eng && m droid dist && test -e out/dist/flags.pb && test -e out/dist/flags.textproto
Change-Id: Ic29d69ab5014593a3f9213f8a5b55e0569922cc9
2024-02-23 09:22:56 +01:00
Tongbo Liu
623a4d9cc7 [automerger skipped] Merge "[DO NOT MERGE] Build MCTS on mainline branches" into udc-mainline-prod am: 4cbde4a6a9 -s ours
am skip reason: contains skip directive

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

Change-Id: I4c3c74e7772fdd8029f017017585c7d05e24d964
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-23 05:29:12 +00:00
Tongbo Liu
bc4f191fa3 [automerger skipped] [DO NOT MERGE] Build MCTS on mainline branches am: 1643c88c6a -s ours
am skip reason: contains skip directive

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

Change-Id: I80e515942bf9f7c99bf82869ba5bdf9b6260d487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-23 05:29:04 +00:00
Treehugger Robot
d37144251e Merge changes I67893f8c,I5f29258e into main am: df3f773e78 am: 7f8c0e0c97
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2967064

Change-Id: I26ece883bb939279de60cdb25ee6a976f62aa8d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-23 05:27:54 +00:00
Tongbo Liu
4cbde4a6a9 Merge "[DO NOT MERGE] Build MCTS on mainline branches" into udc-mainline-prod 2024-02-23 04:47:38 +00:00
Treehugger Robot
7f8c0e0c97 Merge changes I67893f8c,I5f29258e into main am: df3f773e78
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2967064

Change-Id: I4b3afe0dc6131eaed80837c7ba982b0ac6bbce99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-23 04:45:33 +00:00
Treehugger Robot
df3f773e78 Merge changes I67893f8c,I5f29258e into main
* changes:
  Ensure that filesystem module can track modules with prefer32
  bpf modules can be included in filesystem modules
2024-02-23 03:58:16 +00:00
Jihoon Kang
40d6280eb2 Convert the build flag RELEASE_EXPORT_RUNTIME_APIS to a product variable am: 35349466cd am: d881124481
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2973435

Change-Id: Ibd79e6f44a9f776293db83efac8636c32a2acf85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-23 02:55:32 +00:00
Jihoon Kang
aaf1089e92 Introduce product variable PRODUCT_HIDDEN_API_EXPORTABLE_STUBS am: b36fc547c0 am: 14c69449f3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2973434

Change-Id: Ibdf5670767c12390e3b5ea86a45bc2a55efe55b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-23 02:55:26 +00:00
Jihoon Kang
d881124481 Convert the build flag RELEASE_EXPORT_RUNTIME_APIS to a product variable am: 35349466cd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2973435

Change-Id: If699df9c820f06564446c5fac15ad79e2bb9365f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-23 02:36:45 +00:00
Jihoon Kang
14c69449f3 Introduce product variable PRODUCT_HIDDEN_API_EXPORTABLE_STUBS am: b36fc547c0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2973434

Change-Id: I8a7ccf940ea8ce15ca3440488c2f7146bf0d58bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-23 02:36:40 +00:00
Jihoon Kang
35349466cd Convert the build flag RELEASE_EXPORT_RUNTIME_APIS to a product variable
RELEASE_EXPORT_RUNTIME_APIS build flag is currently used to modify the
filter condition for the "exportable" stubs, so that it exposes wider
set of flagged apis (ENABLED && READ_ONLY vs ENABLED || READ_WRITE).
This flag was originally introduced as a build flag to be enabled in
specific release configurations, but instead this is used as a product
variable that will be enabled in the product `sdk_with_runtime_apis`,
which will be introduced in a future change.

Test: m nothing --no-skip-soong-tests
Bug: 326312949
Change-Id: Ieb3cee517dd6cedcca844a9eab270aedf8199d4e
2024-02-22 20:10:22 +00:00
Jihoon Kang
b36fc547c0 Introduce product variable PRODUCT_HIDDEN_API_EXPORTABLE_STUBS
The new product variable behaves identical to the build flag
RELEASE_HIDDEN_API_EXPORTABLE_STUBS: if the variable is set to true, the
hiddenapi flags are generated from the "exportable" stubs (i.e. the
stubs that does not include READ_WRITE permission or DISABLE state
flagged apis) instead of the "everything" stubs (i.e. the stubs that
includes all flagged apis regardless of the state of the flags). If the
variable is set to false, the stubs are generated from the "everything"
stubs.

This product variable will be utilized for `sdk_with_runtime_apis`
product in the future changes.

Test: m nothing
Bug: 326310637
Change-Id: I8872d0b0617eb0f25da32611837ad823c77b0df7
2024-02-22 20:09:46 +00:00
Cole Faust
cd63b7e771 Merge "Allow soong config value variables to set nested properties" into main am: c7a806a657 am: f93a27af9e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2972371

Change-Id: I4ef4b0c5a0e1e94ab868f3cd443d8ff18e68b4bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-22 19:35:53 +00:00
Cole Faust
f93a27af9e Merge "Allow soong config value variables to set nested properties" into main am: c7a806a657
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2972371

Change-Id: I26f2bd95fc23bf3f96477911fe61210c78c79d7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-22 18:56:04 +00:00
Cole Faust
c7a806a657 Merge "Allow soong config value variables to set nested properties" into main 2024-02-22 18:22:02 +00:00
Tongbo Liu
1643c88c6a [DO NOT MERGE] Build MCTS on mainline branches
Ignore-AOSP-First: test for mainline internal branch
Bug: 323532076
Test: m mcts
Change-Id: I0357c29fdd604c48859f5b5c5bf96e27da41fef6
2024-02-22 09:55:31 +00:00
Stephen Hines
f1d4e8bf44 Merge "rustc-1.75.0 Build 11471753" into main am: b0e708d03d am: b9a34dff5a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2969319

Change-Id: Ie09f0d54db9adf17e0bf75000ae262cd1bb6e5c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-22 08:45:07 +00:00
Stephen Hines
b9a34dff5a Merge "rustc-1.75.0 Build 11471753" into main am: b0e708d03d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2969319

Change-Id: Ie8cde3332f9256615ef58a9384c7eb4d42ebc54f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-22 08:05:17 +00:00
Nishant Panwar
a78f0a0d01 Merge "Add SDK library framework-pdf-v in MediaProvider" into main am: 6636216116 am: 705982f4e1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2953730

Change-Id: Ia29242b4532d4d7009866d5477561904b8db9bf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-22 07:43:42 +00:00
Stephen Hines
b0e708d03d Merge "rustc-1.75.0 Build 11471753" into main 2024-02-22 07:29:40 +00:00
Nishant Panwar
705982f4e1 Merge "Add SDK library framework-pdf-v in MediaProvider" into main am: 6636216116
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2953730

Change-Id: Ia85d07580f2386735957dbfd8d159cffe8407d6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-22 07:02:26 +00:00
Nishant Panwar
6636216116 Merge "Add SDK library framework-pdf-v in MediaProvider" into main 2024-02-22 06:32:14 +00:00
Treehugger Robot
48a71014cd Merge "Setting the version to 350090000 while we figure out what version numbers to use" into main 2024-02-21 19:55:48 +00:00
Cole Faust
1da0b20575 Allow soong config value variables to set nested properties
Previously, it would error out if it saw anything that wasn't a string
or slice of strings. Now it will also recurse in sub-structs.

Fixes: 326255534
Test: go test
Change-Id: Icbca8e4a2cf54b5610599a10805550fed05eb396
2024-02-21 11:38:09 -08:00
Aditya Kumar
4e27d68f6f Merge "Remove wtautological warnings added during toolchain update" into main am: 6edbaa369f am: 88ce10f609
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2952984

Change-Id: I6c4688bbfd8da0b06ae28a05faaf89db8987c785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 19:05:30 +00:00
Yu Liu
f133acae71 Merge "Support aconfig stoage files for apex." into main am: 864fd2f1f5 am: cd72a6387a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2966056

Change-Id: I86d77269802f6e3f4ef548bc53352edd99acb7f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 19:05:18 +00:00
Aditya Kumar
88ce10f609 Merge "Remove wtautological warnings added during toolchain update" into main am: 6edbaa369f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2952984

Change-Id: Ibec9ac92e9fbf3b7ab4ddeef285ac6c153508959
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 18:49:37 +00:00
Yu Liu
cd72a6387a Merge "Support aconfig stoage files for apex." into main am: 864fd2f1f5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2966056

Change-Id: Ia4fa4729d2d4967c56c72dff3a9007927782cf2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 18:48:39 +00:00
Colin Cross
304fe339c6 [automerger skipped] Merge META-INF/services/* files in merge_zips -jar am: 1e1f0188c1 -s ours
am skip reason: Merged-In I69f80d1265c64c671d308ef4cdccfa1564abe056 with SHA-1 47efcdcf6b is already in history

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

Change-Id: Ia4aa3a1d1e77f13e564c66df214ec179b3aea300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 18:47:06 +00:00
Colin Cross
aa8fc1815c [automerger skipped] Strip META-INF/services from implementation jars when using as header jars am: 9bc4228f88 -s ours
am skip reason: Merged-In I40d48644bc5a09a9564dc2c4b38f627edd00fcf8 with SHA-1 d3b1b77184 is already in history

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

Change-Id: I3317bd19393b6fd53f7262d931c53d6f252736af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 18:47:00 +00:00
Aditya Kumar
6edbaa369f Merge "Remove wtautological warnings added during toolchain update" into main 2024-02-21 18:43:28 +00:00
Alexei Nicoara
9a0bdffa85 Setting the version to 350090000 while we figure out what version numbers to use
Bug: 323452698
Change-Id: I3e716485e719ca986ffe9dfcb93da1669de0c758
Test: presubmit
2024-02-21 17:49:22 +00:00
Yu Liu
864fd2f1f5 Merge "Support aconfig stoage files for apex." into main 2024-02-21 17:42:58 +00:00
Andrew Walbran
440a281939 Merge "Revert^4 "Integrate Rust-specific System Properties into rules generation."" into main am: c0a6d29e49 am: a556c303b9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2965053

Change-Id: I66b6a08065a81e6409cc0527cef0f449dce25865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 13:01:03 +00:00
Andrew Walbran
a556c303b9 Merge "Revert^4 "Integrate Rust-specific System Properties into rules generation."" into main am: c0a6d29e49
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2965053

Change-Id: I195bfa8667027039d1259016d8150f07d7548a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 12:21:31 +00:00
Andrew Walbran
c0a6d29e49 Merge "Revert^4 "Integrate Rust-specific System Properties into rules generation."" into main 2024-02-21 11:53:45 +00:00