StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,422 Commits 1 Branch 0 Tags
235ed9f7793824a236f4c58ac9da5f1556c1140d
Commit Graph

64422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Spandan Das
235ed9f779 Merge changes Ie6ae7e26,I2fd822a2,Iddd497df,Iee5a936e,I628b443c am: ea93f64f03 am: 03ea4670b3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2457063

Change-Id: I353c62d15886c81f275e6a18ada3567ede8f189c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 00:54:52 +00:00
Spandan Das
03ea4670b3 Merge changes Ie6ae7e26,I2fd822a2,Iddd497df,Iee5a936e,I628b443c am: ea93f64f03 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2457063

Change-Id: Iead66d683ffc776d2bde50f7dfab1897804d9538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 00:13:39 +00:00
Spandan Das
ea93f64f03 Merge changes Ie6ae7e26,I2fd822a2,Iddd497df,Iee5a936e,I628b443c 
* changes:
  Update min_sdk_version from SdkSpec to ApiLevel
  Always include host variants in the sdk snapshot
  Prework for migrating min_sdk_version from (kind+level) to (level)
  Create EffectiveVersion* functions for ApiLevel
  Create two sentinel api levels
 2023-03-20 23:33:48 +00:00
Treehugger Robot
a079b339b8 Merge "Fix CI failures, comment out dcla cases temporarily." am: 94d107020a am: f3a162875a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2497935

Change-Id: Ia1c64ce1985d51238f7e3a1bdcfe42a8ec61eae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 22:35:16 +00:00
Elliott Hughes
fd9d6b45c0 Merge "Generate NDK stubs for riscv64 too." am: 65a97364ba am: 1fa58086a1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2488597

Change-Id: I2e6ccb30e9530ce86848410fed4dcaf3e7bcfaf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 22:34:28 +00:00
Treehugger Robot
f3a162875a Merge "Fix CI failures, comment out dcla cases temporarily." am: 94d107020a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2497935

Change-Id: I41cfd947f653b5561ff42c6071bfd87d3671b8cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 21:55:31 +00:00
Elliott Hughes
1fa58086a1 Merge "Generate NDK stubs for riscv64 too." am: 65a97364ba 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2488597

Change-Id: I2c0b840e85c4a9df4436ce8edc70625875dbef98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 21:54:45 +00:00
Treehugger Robot
94d107020a Merge "Fix CI failures, comment out dcla cases temporarily." 2023-03-20 21:35:10 +00:00
Elliott Hughes
65a97364ba Merge "Generate NDK stubs for riscv64 too." 2023-03-20 21:10:53 +00:00
Liz Kammer
0f755853d7 Merge "Add documentation for BuildParams" am: 071c76e223 am: a42a6712db 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2490500

Change-Id: I37038edd60e7761ae4f6593273e936613a1e2b76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 20:09:33 +00:00
Liz Kammer
a42a6712db Merge "Add documentation for BuildParams" am: 071c76e223 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2490500

Change-Id: If2bd6051f0ff474168002dc37a388376fb93b750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 19:26:12 +00:00
Treehugger Robot
61373ea2c1 Merge "Enable annotations for sealed classes" am: 759524afc9 am: 842b197f4a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2484075

Change-Id: I50b34b6f06160d196fd49783a4c53fc98079ff63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 18:46:00 +00:00
Liz Kammer
1a5ed337eb Merge "Move fingerprint genrule and DCLA cc libraries to prod allowlists." am: 063b5773b3 am: ab2ddad59e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2497036

Change-Id: I50af95506bda718bcc6883a7c334d4b8f44ea5f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 18:44:31 +00:00
Treehugger Robot
eabf97be72 Merge "Denylist failing cc_tests svcenc and svcdec." am: 61980fe2dd am: eb78448fd3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2497195

Change-Id: I1c1b50351be85201b9e6203609bceb0d0685013f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 18:44:16 +00:00
Liz Kammer
071c76e223 Merge "Add documentation for BuildParams" 2023-03-20 18:42:24 +00:00
Treehugger Robot
842b197f4a Merge "Enable annotations for sealed classes" am: 759524afc9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2484075

Change-Id: I155b0363c9922abb8e9cdcad7d0a5998e77afd4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 18:08:21 +00:00
Wei Li
4a77c55b81 Fix CI failures, comment out dcla cases temporarily. 
Bug: 274473434
Test: CIs
Change-Id: Ia1b8860ac46dad6b9670880613b6559561e37dbf
 2023-03-20 18:07:40 +00:00
Liz Kammer
ab2ddad59e Merge "Move fingerprint genrule and DCLA cc libraries to prod allowlists." am: 063b5773b3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2497036

Change-Id: Id378cc0cb8197f876dcecd31b343fe683042f6c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 18:05:02 +00:00
Treehugger Robot
eb78448fd3 Merge "Denylist failing cc_tests svcenc and svcdec." am: 61980fe2dd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2497195

Change-Id: Iba4557e00d8d6cfd3db4cf685a11f68e35a0a1fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 18:04:10 +00:00
Treehugger Robot
759524afc9 Merge "Enable annotations for sealed classes" 2023-03-20 17:52:31 +00:00
Liz Kammer
063b5773b3 Merge "Move fingerprint genrule and DCLA cc libraries to prod allowlists." 2023-03-20 17:29:37 +00:00
Treehugger Robot
61980fe2dd Merge "Denylist failing cc_tests svcenc and svcdec." 2023-03-20 17:25:50 +00:00
Alix Espino
fff54efaf8 Merge "Bp2build for android_app minsdkversion property" am: 895bc9463b am: 9de50677f7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2496376

Change-Id: I8ad56d717afc00862ad111280cf5ae1ab0496740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 17:04:10 +00:00
Spandan Das
e773739787 Update min_sdk_version from SdkSpec to ApiLevel 
min_sdk_version signifies device version and does not need an sdkKind to
describe it fully. Update the type and cleanup existing usages. As a
side benefit, we also get better error handling since users can no
longer enter something like `public_30` as a valid min_sdk_version in bp
files

Will do a similar cleanup for targetSdkVersion and maxSdkVersion in a
followup CL

Test: m nothing
Test: no change in ninja files (this should be a no-op)
Bug: 208456999

Change-Id: Ie6ae7e267d093c5e4787e82685daaca1021d202e
 2023-03-20 16:51:32 +00:00
Spandan Das
3015e38a5f Always include host variants in the sdk snapshot 
Host tools (and variants in general) should not fall under the purview
of min_sdk_version check. These do not exist on device, so
min_sdk_version check would not make such sense.

This is prework for migrating min_sdk_version from type SdkSpec to
ApiLevel.

Test: go test ./sdk
Bug: 208456999

Change-Id: I2fd822a223d1dc5e290d4a1ebf304fe47a5b0416
 2023-03-20 16:40:08 +00:00
Spandan Das
ea4c692875 Prework for migrating min_sdk_version from (kind+level) to (level) 
Currently, the following lib will be included in the sdk snapshot even
though it is compiling against private apis
```
java_sdk_library {
  name: "foo",
  //sdk_version defaults to "",  i.e. SdkSpecPrivate
}
```

This is because min_sdk_version of `foo` inherits the api level of
SdkSpecPrivate (i.e. FutureApiLevel).

As part of the migration of min_sdk_version to ApiLevel, the api level
of SdkSpecPrivate will be different than FutureApiLevel. In the above
example, assuming the version of the sdk_snapshot is FutureApiLevel,
`foo` will be included only if it explicitly sets a min_sdk_version <=
FutureApiLevel. Update an existing unit test to set this value
explicitly.

Bug: 208456999
Test: go test ./sdk (top of CL stack)

Change-Id: Iddd497df7da8c829325d902fbf70731dd8c6855d
 2023-03-20 16:40:08 +00:00
Spandan Das
5780039180 Create EffectiveVersion* functions for ApiLevel 
These functions already exist on SdkSpec(kind+level) and are used for
computing the effective version for vendor modules compiling against
current or system_current which depends on the sdkKind

Create these functions for ApiLevel to support migrating MinSdkVersion
from SdkSpec to ApiLevel. Since the "api level" of vendor modules depend
on the sdk_kind as well, these functions will continue to exist on
SdkSpec.

Test: m nothing
Test: no diff in ninja files (this should be a no-op)
Bug: 208456999

Change-Id: Iee5a936e72b02b4fab9e457082d46fb8358eff16
 2023-03-20 16:40:08 +00:00
Spandan Das
7ee04614cd Create two sentinel api levels 
InvalidApiLevel:
This will be used for error handling if a user provided api level is
not recognized

PrivateApiLevel:
This will be used to differentiate the api level of sdk_version:"" from
sdk_version:"current" or sdk_version:"<active_codename>" (all used to be
FutureApiLevel previously). This was not necessary previously since the
type of min_sdk_version was SdkSpec(kind+level). Since it had access to
kind, it could check that it was not SdkSpecPrivate

Test: m nothing
Change-Id: I628b443c34bf2ec258d947dfec09f38b126bc6bb
 2023-03-20 16:40:08 +00:00
Alix Espino
9de50677f7 Merge "Bp2build for android_app minsdkversion property" am: 895bc9463b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2496376

Change-Id: I51b1ce233374bf32eb8ada965843675726b72c30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 16:24:59 +00:00
Alix Espino
895bc9463b Merge "Bp2build for android_app minsdkversion property" 2023-03-20 15:38:53 +00:00
Jingwen Chen
b5edbf9b8a Denylist failing cc_tests svcenc and svcdec. 
Bug: 274164834
Test: presubmits
Change-Id: I281b3198b39468bdf435d318af87c336fd3500c9
 2023-03-20 13:17:49 +00:00
Liz Kammer
daefe0c6bd Add documentation for BuildParams 
Test: n/a
Change-Id: I867b3c2b7faad66a1b8c3b772214673b2c56a3b8
 2023-03-20 09:14:30 -04:00
Ioana Alexandru
18fed433ff Merge "Revert "Export non-apex variants of modules to make"" am: 54fb18d43b am: aebbc670a6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2497035

Change-Id: Ibbb4eeb858d50e49391ee606486f7b15a90a39f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 12:16:06 +00:00
Ioana Alexandru
aebbc670a6 Merge "Revert "Export non-apex variants of modules to make"" am: 54fb18d43b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2497035

Change-Id: Ie1dc599c3fe5a342e613b3922a4cb3da7b6e8dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 11:39:11 +00:00
Ioana Alexandru
54fb18d43b Merge "Revert "Export non-apex variants of modules to make"" 2023-03-20 11:08:55 +00:00
Jingwen Chen
01addfcd49 Move fingerprint genrule and DCLA cc libraries to prod allowlists. 
Fixes: 263406837
Test: presubmits
Test: abtd (TBD)
Change-Id: I1dbf3021cb671e0a395efe755fd579634985e886
 2023-03-20 11:08:22 +00:00
Jingwen Chen
8ac7d7d01d Revert "Export non-apex variants of modules to make" 
This reverts commit 502da3987a.

Reason for revert: b/274195633

```
In file included from out/soong/installs-aosp_cf_x86_pasan.mk:134984:
In file included from out/soong/Android-aosp_cf_x86_pasan.mk:981696:
In file included from build/make/core/soong_cc_rust_prebuilt.mk:76:
build/make/core/base_rules.mk:342: error: packages/modules/Uwb/service/uci/jni: MODULE.TARGET.SHARED_LIBRARIES.libuwb_uci_jni_rust already defined by packages/modules/Uwb/service/uci/jni.
```

Change-Id: Ic1ea6969e54c23a7d126eb0fb47ab6f2e44ee965
 2023-03-20 11:05:16 +00:00
Ziwei Zhang
ab2f14bc69 Merge "Add python template for mobly tests." am: e75fcf4ddb am: bf671be40f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2471946

Change-Id: I71a863e540b18d8164a8d14fbe415ed96add2084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 03:28:46 +00:00
Ziwei Zhang
bf671be40f Merge "Add python template for mobly tests." am: e75fcf4ddb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2471946

Change-Id: I05cb13fb12a7a0e7508247e33c998b826df92fa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 02:50:35 +00:00
Ziwei Zhang
e75fcf4ddb Merge "Add python template for mobly tests." 2023-03-20 02:16:04 +00:00
Treehugger Robot
19fa849f45 Merge "Remove --extra_toolchains flag from aquery runner" am: 9ba1ddd355 am: 23eadd1aab 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2496175

Change-Id: I8ddeb9b9846c64213a5589e78fd2c9a568177aee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-19 00:13:59 +00:00
Treehugger Robot
23eadd1aab Merge "Remove --extra_toolchains flag from aquery runner" am: 9ba1ddd355 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2496175

Change-Id: I73361029b4aa5af64732eb7f95c2419aee66ed29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 23:31:29 +00:00
Treehugger Robot
9ba1ddd355 Merge "Remove --extra_toolchains flag from aquery runner" 2023-03-18 22:56:50 +00:00
Treehugger Robot
d6559f0ab5 Merge "Resolve metrics_proto warning" am: f4f034356e am: 02ae012585 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494676

Change-Id: Ib812f12a7c2fb831add864c0a19de12c8e1f7c09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 23:06:51 +00:00
Treehugger Robot
02ae012585 Merge "Resolve metrics_proto warning" am: f4f034356e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494676

Change-Id: Iaf06813d13e798c601db7afd119986c4face2e23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 22:29:03 +00:00
Treehugger Robot
633d047fc7 Merge "Depend on stubs via @api_surfaces" am: c887ac6a04 am: 668b760be4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494344

Change-Id: I53e79802eaeb2912d370fd56932789961d1302ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 21:50:09 +00:00
Treehugger Robot
e3c4f4dbd5 Merge "Create a sh_binary target for jars-to-module-info" am: 9054cfb3d8 am: a57bdbbbc8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494318

Change-Id: Ic89974c10b99e8cd2e73ed0468a943cb6a79e98c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 21:49:24 +00:00
Romain Jobredeaux
78f32e270a Merge "Exclude jdk17 from bp2build instead of jdk11" am: b1559e9901 am: 7e28dca791 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494981

Change-Id: I2924d64d1972745ceddd4a1bc9cd0c688efc680d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 21:49:01 +00:00
Treehugger Robot
f4f034356e Merge "Resolve metrics_proto warning" 2023-03-17 21:46:55 +00:00
Treehugger Robot
668b760be4 Merge "Depend on stubs via @api_surfaces" am: c887ac6a04 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494344

Change-Id: Ibedb016f2a144e499c289919beddf87bbda525c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 21:14:18 +00:00