Commit Graph

53709 Commits

Author SHA1 Message Date
Vladimir Marko
7e556310b9 Merge "Stop installing a profile into an APEX if profiles are disabled." am: edd6fde587
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1913479

Change-Id: Ic8051e916e4b6679c626ff4086b8d90b611fd012
2021-12-08 15:48:19 +00:00
Vladimir Marko
edd6fde587 Merge "Stop installing a profile into an APEX if profiles are disabled." 2021-12-08 15:29:14 +00:00
Treehugger Robot
db945439c9 Merge "Support rust_toolchain_library for rust-project" am: a85f7bde32 am: 6c8f0b3890 am: 007523fcbd am: 1afb252581
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1913472

Change-Id: I49467874b77c31dfb9387a4e4d592ed6a9aa8ad5
2021-12-08 15:24:18 +00:00
Treehugger Robot
1afb252581 Merge "Support rust_toolchain_library for rust-project" am: a85f7bde32 am: 6c8f0b3890 am: 007523fcbd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1913472

Change-Id: Ib2d024049ac1e5a2db3477697a5f5ea38b341e66
2021-12-08 15:04:15 +00:00
Treehugger Robot
007523fcbd Merge "Support rust_toolchain_library for rust-project" am: a85f7bde32 am: 6c8f0b3890
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1913472

Change-Id: I64234506a048dae951bf96231cc0f76e781249e2
2021-12-08 14:52:32 +00:00
Treehugger Robot
6c8f0b3890 Merge "Support rust_toolchain_library for rust-project" am: a85f7bde32
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1913472

Change-Id: Ieb965dbbd60cdc2936c552895b828edb2a046228
2021-12-08 14:36:50 +00:00
Nikita Iashchenko
86d22bfea1 Merge "Add jdk.internal.ref to package_allowed_list.txt (OpenJDK 11)" am: 84bec80023 am: 004405ed8a am: a2615804f0 am: 208a7344aa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1818345

Change-Id: Ib42899ced52bf44380a9d47b794b3ad4b2d243a3
2021-12-08 14:36:03 +00:00
Liz Kammer
ac47b4d398 Merge "Propagate headers from bazel to mixed builds" am: 92d4188c2b am: 8534a37261 am: 5da0c42a09 am: cf392311e6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1912212

Change-Id: I3f53ec91a47c2eace89bff50458a8f861329f0fb
2021-12-08 14:35:48 +00:00
Nikita Iashchenko
208a7344aa Merge "Add jdk.internal.ref to package_allowed_list.txt (OpenJDK 11)" am: 84bec80023 am: 004405ed8a am: a2615804f0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1818345

Change-Id: I9eb472227ade974747940e984d98041e79294560
2021-12-08 14:18:41 +00:00
Liz Kammer
cf392311e6 Merge "Propagate headers from bazel to mixed builds" am: 92d4188c2b am: 8534a37261 am: 5da0c42a09
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1912212

Change-Id: I656710bf84a13af99b98712ee5934c5e21e8e5c2
2021-12-08 14:18:28 +00:00
Treehugger Robot
a85f7bde32 Merge "Support rust_toolchain_library for rust-project" 2021-12-08 14:14:34 +00:00
Nikita Iashchenko
a2615804f0 Merge "Add jdk.internal.ref to package_allowed_list.txt (OpenJDK 11)" am: 84bec80023 am: 004405ed8a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1818345

Change-Id: I07b8664a483cb62d820a7ddefc5a6c7570947187
2021-12-08 14:04:10 +00:00
Liz Kammer
5da0c42a09 Merge "Propagate headers from bazel to mixed builds" am: 92d4188c2b am: 8534a37261
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1912212

Change-Id: I945a0d155ec6a5edd171c20acd8c8bad19784aed
2021-12-08 14:03:58 +00:00
Nikita Iashchenko
004405ed8a Merge "Add jdk.internal.ref to package_allowed_list.txt (OpenJDK 11)" am: 84bec80023
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1818345

Change-Id: Idacc12bb5f9504b4e9c862bacf2c137855c31aaa
2021-12-08 13:47:43 +00:00
Liz Kammer
8534a37261 Merge "Propagate headers from bazel to mixed builds" am: 92d4188c2b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1912212

Change-Id: I80abd9375d5acc7b5b0a18de975227df239075fd
2021-12-08 13:47:24 +00:00
Nikita Iashchenko
84bec80023 Merge "Add jdk.internal.ref to package_allowed_list.txt (OpenJDK 11)" 2021-12-08 13:40:44 +00:00
Liz Kammer
92d4188c2b Merge "Propagate headers from bazel to mixed builds" 2021-12-08 13:24:08 +00:00
satayev
758968a700 Allow java_sdk_library in an APEX to have higher min_sdk_version.
Inidividual boot or system server jars may have higher min_sdk_version
than the contianing apex, since the runtime respects the values of
min/max_sdk_version; e.g. runtime would not load a boot jar with
higher min_sdk_version. This allows shipping new boot jars via apexes
that target older platforms.

Bug: 190818041
Test: presubmit
Change-Id: I08ec0b4463a17bc8265b948fe09da55eb4e52ac3
2021-12-08 11:36:34 +00:00
satayev
8f088b09d8 Perform CheckMinSdkVersion for java_sdk_library.
In a follow up, apex would expect that any module that implements
ModuleWithMinSdkVersionCheck to have performed appropate checks on
min_sdk_version, to allow relaxing some of the existing conditions.

This change moves the responsibility of checking min_sdk_version
of java_sdk_library to java_sdk_library itself.

Bug: 205923322
Test: presubmit
Change-Id: I79b5a1fc34098fff60221e416db6e6e69e01f531
2021-12-08 11:36:34 +00:00
satayev
ad99149a62 Add MinSdkVersion(ctx) method to ModuleWithMinSdkVersionCheck interface.
Bug: 205923322
Test: presubmit
Change-Id: I469d655823e12a14bc0abaeb544a5dd2a6d3622f
2021-12-08 11:36:31 +00:00
Jiakai Zhang
29e35e115d Stop installing a profile into an APEX if profiles are disabled.
Bug: 209630530
Test: art/tools/golem/build-target.sh
Change-Id: I0ac4e1860a47da20626b423b9b1f62dd49259deb
2021-12-08 11:05:19 +00:00
sophiez
2965f45751 Java APIs used by Mainline modules.
Add scripts to generate java APIs used by Mainline modules. This is
aosp/1879177 with fixed build error that caused by dexdeps analyzing
resource only APKs which doesn't contains any .dex files. Now skip the
error generates in that case in gen_java_usedby_apex.sh

Test: TARGET_BUILD_APPS=com.android.adbd m dist apps_only
Change-Id: Id539cbe1b7306ace69c047f95ffc02265a467511
Merged-In: Id539cbe1b7306ace69c047f95ffc02265a467511
2021-12-08 07:35:37 +00:00
Treehugger Robot
589ee0c600 Merge "Add (obj|tidy)-*_os, and (obj|tidy)-*_subset targets" am: 939cb7b028 am: bf92b6d44e am: c028e47a3a am: 3b23e8bcb1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1852749

Change-Id: Ie44defb9513e2aa1957300c9bb9778ab835e5602
2021-12-08 07:25:26 +00:00
Treehugger Robot
3b23e8bcb1 Merge "Add (obj|tidy)-*_os, and (obj|tidy)-*_subset targets" am: 939cb7b028 am: bf92b6d44e am: c028e47a3a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1852749

Change-Id: Iff32a1cdef6d911870a30200d4eca0382db7df8c
2021-12-08 06:58:12 +00:00
Thiébaud Weksteen
566eb80d3c Support rust_toolchain_library for rust-project
Bug: 209678277
Test: SOONG_GEN_RUST_PROJECT=1 m nothing; check that libstd is included
Change-Id: Ic197e00bc4695aa6dcd46b8c704a82a2e5e90460
2021-12-08 17:54:19 +11:00
Treehugger Robot
c028e47a3a Merge "Add (obj|tidy)-*_os, and (obj|tidy)-*_subset targets" am: 939cb7b028 am: bf92b6d44e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1852749

Change-Id: I56a4c90afe22b7cc527bd6a58311a22a4ce9051c
2021-12-08 06:39:15 +00:00
Treehugger Robot
bf92b6d44e Merge "Add (obj|tidy)-*_os, and (obj|tidy)-*_subset targets" am: 939cb7b028
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1852749

Change-Id: I475e6901bebbc7f9b5a9b2efe8c04eb5b5ec0020
2021-12-08 06:21:37 +00:00
Treehugger Robot
939cb7b028 Merge "Add (obj|tidy)-*_os, and (obj|tidy)-*_subset targets" 2021-12-08 06:03:14 +00:00
Dan Willemsen
4745007bb1 Add Darwin x86_64+arm64 universal binary support
This is configured from Make by setting up Darwin+Arm64 as a HOST_CROSS
target (which is largely true, as binaries can't be executed on X86_64
machines). On the Soong side, it's a bit blurier, as we don't current
have any other users that are the same OS but not natively executable
(Linux/musl is executable, Windows/x86 is a different OS).

Instead of requiring cc_binary/etc to become multi-architecture-aware
and using something like common_first/MultiTarget, this defaults all
non-multi-architecture-aware modules to be built with both
architectures. It then adds a dependency with the
DarwinUniversalVariantTag so that supporting modules can get the outputs
of the other variant.

Cc uses that dependency tag to run lipo on shared libraries and binaries
so that the output of the x86_64 variant is actually a fat binary
including both architectures.

Bug: 203607969
Test: build sdk-repo targets on a Mac
Change-Id: Icbddb0a177c0ba19d3e0d11f8cf568e0d1ea3245
2021-12-07 22:01:25 -08:00
Treehugger Robot
9f0af82f2e Merge "Update clang version to clang-r437112" am: 4efcb9d81a am: cd53bf5bee am: b715c03c68 am: 2261c90132
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1913743

Change-Id: I2d54a702009d9b2cff3b0a2a3974867d598ad7e4
2021-12-08 05:11:36 +00:00
Treehugger Robot
2261c90132 Merge "Update clang version to clang-r437112" am: 4efcb9d81a am: cd53bf5bee am: b715c03c68
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1913743

Change-Id: I582b487227b18bba143b8c95751499f13dc2ecdb
2021-12-08 04:54:48 +00:00
Treehugger Robot
b715c03c68 Merge "Update clang version to clang-r437112" am: 4efcb9d81a am: cd53bf5bee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1913743

Change-Id: I1b1dc8a5cc1a1ee517ed74b71d45045eb1b5dab9
2021-12-08 04:32:09 +00:00
Treehugger Robot
cd53bf5bee Merge "Update clang version to clang-r437112" am: 4efcb9d81a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1913743

Change-Id: Iba7a12a6034585d5c1c7cc3cf9feb6988ae4c9b4
2021-12-08 04:16:31 +00:00
Treehugger Robot
4efcb9d81a Merge "Update clang version to clang-r437112" 2021-12-08 04:00:23 +00:00
Kun Niu
131a5a13fe Revert "Set targetsdkversion to future level if TARGET_BUILD_APPS is not empty"
This reverts commit e33e25b4a5.

Reason for revert: may causing b/209301265,
Test: https://android-build.googleplex.com/builds/abtd/run/L66400000952203490
Change-Id: Ifcccdcfbfc014d4172f4d9488ea699380d3f3ebe
2021-12-08 00:44:07 +00:00
Chih-Hung Hsieh
253fd0609d Update clang version to clang-r437112
Bug: 201432564
Test: make
Change-Id: Idad9e1154b2c65eb29b7682c205f7bb50af17f0b
2021-12-07 15:24:38 -08:00
Treehugger Robot
10d55d3e63 Merge "Add vendor_available: true to libbuildverison" am: d2d8e322f1 am: f0f598bc17 am: 5d06a6576a am: f5af593465
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1912416

Change-Id: I6f768fd2acab73fdb15a676adc97e4b5754cd52f
2021-12-07 22:50:58 +00:00
Treehugger Robot
f5af593465 Merge "Add vendor_available: true to libbuildverison" am: d2d8e322f1 am: f0f598bc17 am: 5d06a6576a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1912416

Change-Id: I63b80ba660b2d0e6c72f3e53d114c46050b055ec
2021-12-07 22:22:25 +00:00
Treehugger Robot
5d06a6576a Merge "Add vendor_available: true to libbuildverison" am: d2d8e322f1 am: f0f598bc17
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1912416

Change-Id: I080389514c4ad8edfda935c0b2a7b7cd3b79ecd4
2021-12-07 22:07:29 +00:00
Liz Kammer
95b278757e Add test for performance testing
This is to ensure benchmarking infra continues working.

Test: go test bp2build tests
Change-Id: I20927652cf427548f6ff58a0c0cb8d3fa5df34d7
2021-12-07 16:59:40 -05:00
Treehugger Robot
f0f598bc17 Merge "Add vendor_available: true to libbuildverison" am: d2d8e322f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1912416

Change-Id: I1edc9dcf067047e8414f1863c5b740084efc2f50
2021-12-07 21:52:13 +00:00
Romain Jobredeaux
fa0f10d6d3 Merge "Initial bp2build converter for android_app." am: 4526269c2e am: f7a7a95c07 am: 019d78829d am: 6ba0a6a4a9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1907394

Change-Id: Ia3aa0e678b02c8405b391fb2665be0c336798c57
2021-12-07 21:34:00 +00:00
Treehugger Robot
7d635c5bad Merge "Fix filter-out being negated in rbc product configuration" am: 022a5faef3 am: 27631d2412 am: 36a7191dba am: 7354edbc9d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1912042

Change-Id: I7951f1a96c0b459cca8349f49d8e8700369a890a
2021-12-07 21:33:24 +00:00
Treehugger Robot
d2d8e322f1 Merge "Add vendor_available: true to libbuildverison" 2021-12-07 21:20:27 +00:00
Romain Jobredeaux
6ba0a6a4a9 Merge "Initial bp2build converter for android_app." am: 4526269c2e am: f7a7a95c07 am: 019d78829d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1907394

Change-Id: If3d0529d27a617440cee0b95112dd896801b0ae6
2021-12-07 21:17:05 +00:00
Treehugger Robot
7354edbc9d Merge "Fix filter-out being negated in rbc product configuration" am: 022a5faef3 am: 27631d2412 am: 36a7191dba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1912042

Change-Id: I4d45598007b181340aa13698bb285d582d9b0226
2021-12-07 21:14:13 +00:00
Romain Jobredeaux
019d78829d Merge "Initial bp2build converter for android_app." am: 4526269c2e am: f7a7a95c07
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1907394

Change-Id: I1e435f1953d5233d654071eba355d4639c0b6385
2021-12-07 20:58:40 +00:00
Chih-Hung Hsieh
80783774b9 Add (obj|tidy)-*_os, and (obj|tidy)-*_subset targets
* The obj-* targets only call clang or clang++ to compile
  C/C++ files, like the tidy-* targets only call clang-tidy.
* Add (obj|tidy)-dir_os and module_os-(obj|tidy) phony targets
  to include only targets of the specified OS.
* Add (obj|tidy)-dir_os_subset and module_os_subset-(obj|tidy) phony targets
  to include only a subset of that OS target group.
  * Most clang-tidy runs produce the same warnings for all variants
    of an OS. The *_subset targets reduce runs over multiple variants.
  * The obj-*subset targets are useful for a quick test to compile
    at least one variant of every C/C++ file for each OS.
* The (obj|tidy)-soong phony target is changed to include only
  (obj|tidy)-top_level_directory targets instead of ALL
  module-(obj|tidy) targets in all subdirectories.
* For aosp_arm64-eng make tidy-* targets; count NINJA commands:
    tidy-soong                     381K
    tidy-soong_subset              106K
    tidy-soong_android             294K
    tidy-soong_android_subset       73K
    tidy-soong_linux_glibc          84K
    tidy-soong_windows              12K
    tidy-bionic                     12K
    tidy-bionic_subset               2.4K
    tidy-bionic_android             11.5K
    tidy-bionic_android_subset       2.1K
    tidy-bionic_linux_glibc          1K
    tidy-device_android              7K
    tidy-device_android_subset       5K
    tidy-hardware_android            3K
    tidy-hardware_android_subset     9K
    libfec_rs-tidy                   33
    libfec_rs_subset-tidy             9
    libfec_rs_android-tidy           18
    libfec_rs_android_subset-tidy     3
* For aosp_arm64-eng make obj-* targets; count NINJA commands:
    obj-soong                      399K
    obj-soong_subset               112K
    obj-soong_android              305K
    obj-soong_android_subset        75K
    obj-soong_linux_glibc           90K
    obj-soong_linux_glibc_subset    38K
    obj-soong_windows               12K
    obj-bionic                      15K
    obj-bionic_subset                3K
    obj-bionic_android              14K
    obj-bionic_android_subset        2.3K
    obj-bionic_linux_glibc           1.3K
    obj-system-core                  6K
    obj-system-core_subset           3K
    obj-frameworks-base             16K
    obj-frameworks-base_subset       6K
    libfec_rs-obj                    33
    libfec_rs_subset-obj              9
    libfec_rs_android-obj            18
    libfec_rs_android_subset-obj      3

Test: NINJA_ARGS="-n" WITH_TIDY=1 make some_obj_tidy_target;
      compare output commands from various phony targets
Bug: 199169329
Bug: 202769240
Change-Id: I186c45dc07c5884888c1063dfc09cf212ffb0ebf
2021-12-07 12:58:11 -08:00
Treehugger Robot
36a7191dba Merge "Fix filter-out being negated in rbc product configuration" am: 022a5faef3 am: 27631d2412
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1912042

Change-Id: I416ba8885e18078465afffedc19680f98a0365fd
2021-12-07 20:56:38 +00:00
Chris Wailes
de796e9cdd Merge "Allow users to enable local incremental Rust builds" am: 58e748d8d4 am: 0691ee250d am: 30ca0071b6 am: e3b1a9fd04
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1910146

Change-Id: I8ae367b544e07c0cc388baf460106d1b73bd609f
2021-12-07 20:48:16 +00:00