Commit Graph

51447 Commits

Author SHA1 Message Date
Treehugger Robot
4ca266f966 Merge "sdkLibraryProperties: fix typo" am: bf04adae7c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2106444

Change-Id: I4df365e81acc2c66bb252b13d44d945c55047671
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 17:01:15 +00:00
Treehugger Robot
bf04adae7c Merge "sdkLibraryProperties: fix typo" 2022-05-25 16:29:47 +00:00
Mårten Kongstad
81d909525d sdkLibraryProperties: fix typo
Test: m nothing
Change-Id: Id9a0ba0a1123a298b8713f6dd6526ccb54fe5c46
2022-05-25 16:27:55 +02:00
Treehugger Robot
52bebd6fa4 Merge "raw_binary output should not be executable." am: 86db8821bb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2104332

Change-Id: Ie93f6f2c4fe865da03b5266ecfe684babbb4e9fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 12:46:13 +00:00
Treehugger Robot
86db8821bb Merge "raw_binary output should not be executable." 2022-05-25 12:28:27 +00:00
Lukács T. Berki
298da6fc78 Merge "Remove support for generating versioned snapshots" am: 3ef0581cda
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2105804

Change-Id: I35affd2f6970f7d1122db105c932fddf4aac1a77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 11:25:22 +00:00
Lukács T. Berki
3ef0581cda Merge "Remove support for generating versioned snapshots" 2022-05-25 10:59:32 +00:00
Yi Kong
e99fbffa25 Merge "Enable string-compare warning" am: f13a66adfd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2098017

Change-Id: I1b0c50bd29d456f3f19be7965d239809430a13a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 07:25:15 +00:00
Yi Kong
f13a66adfd Merge "Enable string-compare warning" 2022-05-25 07:02:34 +00:00
Muhammad Haseeb Ahmad
e353655540 Merge "Make IsSanitizerEnabledForJni return false" am: 53a129db89
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2105764

Change-Id: Ibb3a1ff7d96fe50584aa576f4c0fb9ea626b5144
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 06:40:20 +00:00
Muhammad Haseeb Ahmad
53a129db89 Merge "Make IsSanitizerEnabledForJni return false" 2022-05-25 06:18:18 +00:00
Muhammad Haseeb Ahmad
e6567fe56b Make IsSanitizerEnabledForJni return false
Change-Id: I5e1722bc32b63649fc9973d11e9fd5bdea72ddbe
Test: m
2022-05-25 00:13:08 +00:00
Chris Parsons
ae0a66f4de Add extraNinjaDeps to mixed builds depfile am: 027881cf35
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2105247

Change-Id: Iee2c50ed09dd30ec2cba716ef3681b143f425e4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 22:23:45 +00:00
Paul Duffin
b01ac4b6ba Remove support for generating versioned snapshots
Previously, the code for selecting specific versions of sdk snapshots
was removed (along with the uses_sdks property). That makes versioned
snapshots useless so this change removes all the code and tests that
generated those versioned snapshots.

Bug: 232546567
Test: m nothing
      packages/modules/common/build/mainline_modules_sdks.sh
Change-Id: Ib6d1b72bc8399fbb39075494ae37da92f4b28d03
2022-05-24 20:10:05 +00:00
Chris Parsons
027881cf35 Add extraNinjaDeps to mixed builds depfile
This was accidentally removed in aosp/2094705. Among other possible
issues, this caused the "used environment variable" file to be omitted
from the depfile of soong_build during mixed builds, which would result
in soong_build not being subsequently retriggered during env var
changes.

Sendng this out as a quickfix, regression test to follow.

Bug: 233774464
Test: Manual `m nothing && USE_BAZEL_ANALYSIS=1 m nothing && m nothing`,
verifying that a rebuild was retriggered in each invocation.

Change-Id: I1d9dbd1bc4696df760ebb9be262bc165c161bb21
2022-05-24 19:41:17 +00:00
Sorin Basca
a571b7d389 Merge "Add experimental option to target Java 17" am: 78ce8c23de
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2104326

Change-Id: I2657bd024f5d0eabd609ff4df5d1a088b8dbd1f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 15:36:26 +00:00
Sorin Basca
78ce8c23de Merge "Add experimental option to target Java 17" 2022-05-24 15:12:14 +00:00
Liz Kammer
1446249224 Merge "Handle multiple linkages in sdk snapshots" am: 91f10eccc6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2097793

Change-Id: Iff4cf0e39c3cfa956bc07dd5bea2558a001ea575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 14:29:01 +00:00
Liz Kammer
91f10eccc6 Merge "Handle multiple linkages in sdk snapshots" 2022-05-24 14:13:19 +00:00
Andrew Walbran
79c3b77ea2 raw_binary output should not be executable.
If it is, rust_test (wrongly) tries to execute it when it is used as
data.

Also fixed description and a lint warning while I was at it.

Bug: 233732515
Test: atest vmbase_example.integration_test
Change-Id: I49bf5147a9908549b0f37bdb0678e77676148db8
2022-05-24 13:57:17 +00:00
Sorin Basca
ce720c3663 Add experimental option to target Java 17
Bug: 233029164
Test: EXPERIMENTAL_TARGET_JAVA_VERSION_17=true \
      EXPERIMENTAL_USE_OPENJDK17_TOOLCHAIN=true m
Change-Id: I80a9ba9eb356a460c1036e711e793c2ca6620f53
2022-05-24 13:05:17 +01:00
Yi Kong
8ecb22d402 Enable string-compare warning
Test: presubmit
Bug: 153764102
Change-Id: I6fbf7a841cb6ea7bc8433fd2fddd5a825f68aa22
2022-05-24 16:16:21 +08:00
Wei Li
e577ddd482 Convert the property "manifest" properly for override_apex. am: 40f9873612
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2100361

Change-Id: I959b5a4473c85666283f90a8a015d4b5632129c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 05:12:26 +00:00
Wei Li
40f9873612 Convert the property "manifest" properly for override_apex.
1) When it is not set in base apex, default file name should be set explicitly in bp2build converter of apex
2) The manifest file path should be used as-is when base apex and override_apex is in the same Android.bp
3) The manifest file path should be prepended with package of base apex when base apex and override_apex is in different Android.bp

Bug: 216442475
Test: m nothing
Change-Id: Icd3523ebc31d885f67bea02aec05dbfc77671e87
2022-05-23 17:22:35 -07:00
Liz Kammer
f5e9440e45 Merge "Remove library decorator for extracting headers" am: 707f65d3d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2097186

Change-Id: I770f96513f8942208f62708482395fcd2e2f1b17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 19:42:25 +00:00
Liz Kammer
707f65d3d5 Merge "Remove library decorator for extracting headers" 2022-05-23 19:36:57 +00:00
Cole Faust
a243af2a77 Merge "Add imports property to py_library rules" am: bd4c14a7f9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2100587

Change-Id: I5f7694e23d843d36c655b6ac0c252e4ec2551e13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 19:30:30 +00:00
Treehugger Robot
9130804d06 Merge "Add blockers of cc mainline modules to allowlist" am: 52edad230a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2095405

Change-Id: Ib2323e43a8188df20a42fff74f1ae7818f0611a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 19:30:12 +00:00
Christopher Parsons
6be00cbfac Merge "cc bazel handlers: use better interface checking" am: b002f87d2e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2098663

Change-Id: I4b76d5925f96c0b2d17b1d19e51f77c90266bffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 19:30:01 +00:00
Cole Faust
bd4c14a7f9 Merge "Add imports property to py_library rules" 2022-05-23 18:55:51 +00:00
Treehugger Robot
52edad230a Merge "Add blockers of cc mainline modules to allowlist" 2022-05-23 18:55:01 +00:00
Christopher Parsons
b002f87d2e Merge "cc bazel handlers: use better interface checking" 2022-05-23 18:54:50 +00:00
Treehugger Robot
d5c19f1eb9 Merge "Clean up some bp2build technical debt" am: 5bec8d41ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2075729

Change-Id: I29733bcd49c36590c134862013a1efe5264a9d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 18:25:33 +00:00
Treehugger Robot
5bec8d41ea Merge "Clean up some bp2build technical debt" 2022-05-23 18:01:04 +00:00
Liz Kammer
96320dfff8 Handle multiple linkages in sdk snapshots
Currently, if the same library is specified for multiple of native_libs,
native_shared_libs, and native_static_libs for different arch/oses,
there can be a few errors:

1. specifying a .so file as `srcs` within a cc_prebuilt_library rather
than being specified only for shared
2. the final type of prebuilt library is dependent on the arch/os

This change introduces:
* an ability for a member type to override the type for specified
  properties
  * checks for a library being used with incompatible member types
  * basing linkage nesting on the member type in addition to variants

  This will ensure that the correct library type is used, regardless of
  the order of iteration over oses/arches, and support nesting linkages
  where necessary but only one linkage variant exists.

Test: soong tests
Test: CI
Change-Id: I81dee013b09b99c34ca6c18f9cfcc12ee56d33d1
2022-05-23 10:51:22 -04:00
Jingwen Chen
69acc3f7b8 queryview: don't generate 'for' attributes am: d9d096ec7c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2098619

Change-Id: I3c43fcee824613a504ebfb5a4f21a44e297f4e60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 12:12:50 +00:00
Jingwen Chen
d9d096ec7c queryview: don't generate 'for' attributes
'for' is a reserved keyword

Test: CI
Fixes: b/233579439
Change-Id: I7b94250574465353bbd6bfb82a7ea37ce9ae17a3
2022-05-23 09:38:39 +00:00
Treehugger Robot
1e2e5fcb73 Merge "Revert "Use D8 by default for android_test"" am: 14b500daba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2100965

Change-Id: Ic241b9f002c1e48378fc25254890822495f0ef40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 06:02:47 +00:00
Treehugger Robot
14b500daba Merge "Revert "Use D8 by default for android_test"" 2022-05-23 05:49:40 +00:00
Jared Duke
4e445be558 Revert "Use D8 by default for android_test"
This reverts commit 02edc10047.

Reason for revert: Breaks test_suites_x86_64_coverage

Bug: 233421462
Change-Id: I7b04d3fd7802be0f271ea3c29ef25e3d08ab1389
2022-05-23 04:00:44 +00:00
Bob Badour
433f098306 gen_module visibility tests. am: 0507921dcf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2098695

Change-Id: I1f07372fd8f6ce9aa37b4a04b73af516b9d00455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 03:03:04 +00:00
Bob Badour
d9771dedbb Fix bug: allow multiple gen_notice modules. am: a5ea2479d3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2098696

Change-Id: I3d62df0c4606f65ef635e085e0fae86707b88c5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 03:02:56 +00:00
Bob Badour
0507921dcf gen_module visibility tests.
Test: m cts dist reportmissinglicenses

Change-Id: Ib2f8d0ad46ffe795d392166a74a7c6309b1246e2
2022-05-20 16:54:13 -07:00
Bob Badour
a5ea2479d3 Fix bug: allow multiple gen_notice modules.
Test: m cts dist reportmissinglicenses

Change-Id: I07963c83eaddfe363a04871e813b56fe7f1465ad
2022-05-20 16:54:00 -07:00
Treehugger Robot
db7ee090e1 Merge "Use D8 by default for android_test" am: 1811ed3764
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2097291

Change-Id: Id01a4a5b7223f47fc01c63f222dec7028ea03725
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 23:01:49 +00:00
Treehugger Robot
1811ed3764 Merge "Use D8 by default for android_test" 2022-05-20 22:46:15 +00:00
Wei Li
69fe75500b Merge "Change init process of bp2buildAllowlist so the Soong plugin of bp2build allowlist can hookup properly." am: 440c66a799
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2096884

Change-Id: I1331b91390f551cb5c4a01aac331d7773b01b9b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 21:08:33 +00:00
Wei Li
440c66a799 Merge "Change init process of bp2buildAllowlist so the Soong plugin of bp2build allowlist can hookup properly." 2022-05-20 20:36:40 +00:00
Jared Duke
02edc10047 Use D8 by default for android_test
android_test defaults to using R8, but with shrinking, optimization and
obfuscation disabled, eliminating most of the benefits of R8. Instead,
use D8 by default, improving build performance and avoiding any other
issues that may arise in test-specific code related to whole-program R8
execution. An initial audit shows that android_test targets that *do*
enable shrinking or optimization also explicitly opt in to R8.

A follow-up CL will do the same for android_test_helper_app, but that
requires some additional auditing of downstream targets.

Bug: 192032291
Test: m + presubmit
Change-Id: I5b14a0986dde210f241a77c3a93daacf9e53d667
2022-05-20 12:02:13 -07:00
Lukács T. Berki
912384162a Merge "Remove memberInterVersionMutator." am: 4668e9968c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2101114

Change-Id: I8cf2ce4b2131b3354fc148e267fb7eb1b5e25800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 15:52:46 +00:00