Commit Graph

64328 Commits

Author SHA1 Message Date
Treehugger Robot
2448d10b58 Merge changes Ib9ff4eb5,If27a050c am: 71585a0187
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516456

Change-Id: Ieeba53d45323bde3a481ad7b73127472872828aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 17:11:08 +00:00
Spandan Das
ac7b7d2a89 Merge "Rename core stubs to .txt stubs if applicable" am: 77e3278c50
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2514796

Change-Id: Ia51784b2371933e8531d3f6e02e0d6a27a7bda21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 17:10:07 +00:00
Treehugger Robot
71585a0187 Merge changes Ib9ff4eb5,If27a050c
* changes:
  add *.from-text modules to the java test fixture
  Create a SetBuildFromTextStub method
2023-04-03 16:44:08 +00:00
Spandan Das
77e3278c50 Merge "Rename core stubs to .txt stubs if applicable" 2023-04-03 16:37:53 +00:00
Alix Espino
0e5c5598aa Merge "Simplify logic in Soong ApiLevelFromUserWithConfig" am: 2173e6545a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2509779

Change-Id: Ia66beba64d45559d643e3e0d95a41b90096a8321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 14:08:25 +00:00
Alix Espino
2173e6545a Merge "Simplify logic in Soong ApiLevelFromUserWithConfig" 2023-04-03 13:41:02 +00:00
Treehugger Robot
5485148807 Merge "Remove stub-annotations from art stubs system modules" am: 1c102d34b7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2515531

Change-Id: I18714e495c91f0fbabc7aac909fbaa8656a22380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 11:22:59 +00:00
Treehugger Robot
1c102d34b7 Merge "Remove stub-annotations from art stubs system modules" 2023-04-03 10:49:15 +00:00
Rebecca Chyung
81aa6bdb90 Merge "Revert "Fix NDK library sysroot arrangement."" am: 20d1290cfa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2519695

Change-Id: Ia577d10a077bcc20f4855ad219563041816ceb38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 06:37:44 +00:00
Rebecca Chyung
20d1290cfa Merge "Revert "Fix NDK library sysroot arrangement."" 2023-04-03 06:08:42 +00:00
Rebecca Chyung
961cf1cf9c Revert "Fix NDK library sysroot arrangement."
This reverts commit 169256f535.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/build-details/9868109/targets/mokey-userdebug, bug b/276513771

Change-Id: Iea77994cd4ff0f61a8fa72e52cd1b601bc7cc1a0
2023-04-03 06:06:58 +00:00
Treehugger Robot
073e939604 Merge "Fix rust snapshotInfo provider bug" am: 553d89a825
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516919

Change-Id: I8d1c35eabe99b6fe030f894845e3f7ff9d660057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-01 07:02:49 +00:00
Treehugger Robot
553d89a825 Merge "Fix rust snapshotInfo provider bug" 2023-04-01 06:41:25 +00:00
Treehugger Robot
3ec1c4afb6 Merge "Add spdx-tools and licenseclassifier to soong mocks" am: 88c8d207ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516997

Change-Id: I82b616c851bd3e1368fdbadb0f0942c8df7589a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 21:55:53 +00:00
Treehugger Robot
88c8d207ca Merge "Add spdx-tools and licenseclassifier to soong mocks" 2023-03-31 21:25:37 +00:00
Treehugger Robot
09a2632958 Merge changes Ie9d465f5,Idd89d656,I0a13a0e7 am: cdbb1a999f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2513924

Change-Id: Iab38550e6f6c0ca4ae1fdc57e7e36bd40c3bc082
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 20:03:05 +00:00
Peter Collingbourne
ec7692848e Merge "cuttlefish: Stop building the CVD host package tarball by default." am: bc03688e7c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2493076

Change-Id: I9e122775c4f7ca6fa306aeac397c07629e329afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 20:02:15 +00:00
Dan Albert
ab431f14c7 Merge "Fix NDK library sysroot arrangement." am: dfe24db34f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516116

Change-Id: Ia7107e8e8cd27b7ad01e9f142fc751248c8a2fc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 19:56:25 +00:00
Treehugger Robot
cdbb1a999f Merge changes Ie9d465f5,Idd89d656,I0a13a0e7
* changes:
  Create core_platform system modules from .txt files
  Create system modules using .txt stubs
  Create a defaults module for stripping out annotations
2023-03-31 19:37:01 +00:00
Spandan Das
a335e1de36 Remove stub-annotations from art stubs system modules
This system module is used to compile conscrypt and icu stubs. These
have migrated to java_sdk_library that set `annotations_enabled: true`
explicitly.

Test: m
Test: TH
Change-Id: I65ceb1fbf0dcdbb3504b69ebce6ca8f0b67e964d
2023-03-31 19:28:55 +00:00
Treehugger Robot
0110b797e8 Merge "rename aidl/library.bzl to aidl/aidl_library.bzl" am: 840d49a564
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2515436

Change-Id: Ib6f8a3783f82fb461e4034c5285851a7d9653dad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 19:18:09 +00:00
Peter Collingbourne
bc03688e7c Merge "cuttlefish: Stop building the CVD host package tarball by default." 2023-03-31 19:09:32 +00:00
Dan Albert
dfe24db34f Merge "Fix NDK library sysroot arrangement." 2023-03-31 18:54:46 +00:00
Treehugger Robot
840d49a564 Merge "rename aidl/library.bzl to aidl/aidl_library.bzl" 2023-03-31 18:26:33 +00:00
Ibrahim Kanouche
7c1de51d9e Add spdx-tools and licenseclassifier to soong mocks
Change-Id: I8d394fe1f0633f433b76f66929294e6537e1f809
2023-03-31 17:19:29 +00:00
Treehugger Robot
9b9cda6b14 Merge changes I1ed3ab24,I68678ddf am: 2d704998f4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2513937

Change-Id: Id8ccc3d883bcf37cae7e12d9e5980414e4029bc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 15:23:45 +00:00
Sam Delmerico
dad03f387c Merge "improve error handling for SourceRootDirs" am: b72610665c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516015

Change-Id: I859195c9f3cd860da4163c7329fdd65715cebb44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 15:23:25 +00:00
Treehugger Robot
2d704998f4 Merge changes I1ed3ab24,I68678ddf
* changes:
  Use stubs from .txt files for hiddenapi
  Rename JavaLibraryNameFromText function
2023-03-31 14:59:30 +00:00
Alix
fb502512cb Simplify logic in Soong ApiLevelFromUserWithConfig
Currently, ApiLevelFromUser calls ReplaceFinalizedCodename(raw).
This function checks whether raw is in the getFinalCodenamesMap which is
equivalent to ApiLevelsMapReleasedVersion with an additional entry for current.

Since ApiLevelFromUserWithConfig already returned on the raw = "current"
we only care about ApiLevelsMapReleasedVersion and can avoid the unecessary
use of strconv.Atoi(strconv.Itoa(raw)) that calling ReplaceFinalizedCodename
ends up doing.

Also makes the function look more like the Bazel version in
build/bazel/rules/common/api.bzl

Change-Id: I8c03fc159d7f63298273624f030d1956e2307615
Test: m bp2build
2023-03-31 14:55:13 +00:00
Sam Delmerico
b72610665c Merge "improve error handling for SourceRootDirs" 2023-03-31 14:48:56 +00:00
Sam Delmerico
e55bf08de2 rename aidl/library.bzl to aidl/aidl_library.bzl
Test: b test --config=android //build/bazel/...
Change-Id: I7e22ee5ffa391ddaf43a3eec17812be78f2d86ab
2023-03-31 09:48:27 -04:00
Treehugger Robot
d44721ce7e Merge "rust_proto: use protobuf crate version 2.x" am: 10361f5177
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2501838

Change-Id: I58be6dec80a125f8b4ff3df669255953aa13128f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 11:02:38 +00:00
Treehugger Robot
10361f5177 Merge "rust_proto: use protobuf crate version 2.x" 2023-03-31 10:37:24 +00:00
Inseob Kim
cd2b46aae3 Fix rust snapshotInfo provider bug
We must pass pointer of pointer to correctly cash snapshotInfo and
register provider only once.

Bug: 271215084
Test: build
Change-Id: Ia7b43c7b97a8fcabd3b4d6ac8b990c622b6ceb6e
2023-03-31 18:04:12 +09:00
Prashanth Swaminathan
29143dbbcf Merge "Enable sext.w removal for riscv targets" am: 3b7cb59e4e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2513939

Change-Id: Ifd8e2572af7cda9ece6eccbccba30ccf02942e1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 06:32:05 +00:00
Prashanth Swaminathan
3b7cb59e4e Merge "Enable sext.w removal for riscv targets" 2023-03-31 05:46:04 +00:00
Cole Faust
561e6d376f Merge "Move the testing platforms out of soong_injection" am: e28bde81fd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2514616

Change-Id: I3d2396b730ebf90e36e3b033d72efc740a0e55b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 01:22:55 +00:00
Cole Faust
e28bde81fd Merge "Move the testing platforms out of soong_injection" 2023-03-31 00:17:33 +00:00
Peter Collingbourne
ff56c0124f cuttlefish: Stop building the CVD host package tarball by default.
This change causes us to stop building the CVD host package during
the default `m` build, as this is one of the most time consuming steps
of incremental builds, taking around a minute on my machine. Instead,
we build a directory containing the host package contents. A companion
change to acloud teaches it to upload the directory if it exists.

The host package tarball will continue to be built with `m dist` and `m
hosttar`. When building the host package, just create it from the package
contents directory instead of going through a zip file as we were before.

Bug: 273862156
Change-Id: Id7ab47cd5a2e96d073fcc21ed82d3719119df6b9
2023-03-30 16:44:28 -07:00
Spandan Das
6bd19dd4c5 add *.from-text modules to the java test fixture
Test: go build ./java

Change-Id: Ib9ff4eb59ff63dc208b7a28626d42b53153c86d6
2023-03-30 21:37:54 +00:00
Prashanth Swaminathan
bce5507c02 Enable sext.w removal for riscv targets
Bug: 275574215
Test: Verified boot complete on aosp_cf_riscv64_phone target.
Change-Id: I771dbc492075eec18919b66dc74ae524e3f4b3cd
2023-03-30 20:06:50 +00:00
Steven Moreland
74376679e9 Merge "sbox: print more errors" am: 97f5966f49
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2511859

Change-Id: I96d6aced224b9209b63117dda7bc501f1dc0c15c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 18:58:18 +00:00
Steven Moreland
97f5966f49 Merge "sbox: print more errors" 2023-03-30 18:25:59 +00:00
Sam Delmerico
5121153568 improve error handling for SourceRootDirs
Previously, warnings about missing modules were printed directly to
stderr. Instead we can pass these messages along as errors using the
existing pathways.

Bug: 269457150
Test: m nothing
Test: add -external to PRODUCT_SOURCE_ROOT_DIRS and observe missing
  module errors
Change-Id: I7273c427f38024e3c288f1ecb31175ed04ac44a6
2023-03-30 14:22:38 -04:00
Treehugger Robot
5099f2fabb Merge "Add more modules in HugeModulesMap" am: 7c907b84e7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2513635

Change-Id: Id2300c37c05de912a97ef666bd54d6c7768dfa47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:52:36 +00:00
Jingwen Chen
5cd5934a50 bp2build: denylist some modules to fix CI breakage. am: 29c4561a6b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2514895

Change-Id: I69497895d2a6fd7bcebefee6e5de2f52496ac709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:50:01 +00:00
Chris Wailes
01e3a476c0 Merge "Remove stable feature from allowed features list" am: 8e6d5f208a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2513923

Change-Id: I0b5216d8da521f92fc33ab296cf50bf89b75c7dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:24:48 +00:00
Treehugger Robot
e518bf7c3d Merge "Modify Soong to utilize from-text android.jar in build" am: bc2906efef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2411272

Change-Id: I85a64e1e64f29089bfbd2358d82e5701eb7a038d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:20:47 +00:00
Treehugger Robot
f3bfa281e0 Merge "Remove dead code." am: f1e0ce079c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2512097

Change-Id: Icc1e79ec773ed4a3d5d44c9ca6826be3f500650e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:20:36 +00:00
Treehugger Robot
0f2f95c101 Merge "Enable Wincompatible-function-pointer-types globally" am: 4dd3659393
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2490503

Change-Id: I2f8d62deb44d99699afb8e04626c7cd50179fd36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:20:23 +00:00