Commit Graph

6031 Commits

Author SHA1 Message Date
Spandan Das
714b1defc0 Merge "Export the name of stub java Soong modules" am: ad3555ea33 am: 1b74e968db am: d3487cb522
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2498215

Change-Id: Ib3e36d629b9183c19817f2cfa03d5b4f3ed6969e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 22:51:11 +00:00
Spandan Das
ad3555ea33 Merge "Export the name of stub java Soong modules" 2023-03-23 21:32:03 +00:00
Spandan Das
5109c2de84 Merge "Update min_sdk_version from SdkSpec to ApiLevel" am: ddfab60014 am: f1058758db am: a14f1b45cb am: 7ab0894ea4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2503257

Change-Id: I1c3021291196a61236dff2fc117327dfcdef6197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 20:19:48 +00:00
Spandan Das
a26eda7f2c Update max_sdk_version from SdkSpec to ApiLevel
max_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 max_sdk_version in bp
files

Bug: 208456999
Test: no change in ninja file (this should be a no-op)
Test: TH
Change-Id: I304b5ad802bde200137d8e225182828dfd6f7227
2023-03-23 19:38:56 +00:00
Spandan Das
ca70fc40bd Update target_sdk_version from SdkSpec to ApiLevel
target_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 target_sdk_version in bp
files

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

Change-Id: I3c19245e29184bd9e5660ad8981966f64dfa9424
2023-03-23 19:31:17 +00:00
Spandan Das
7ab0894ea4 Merge "Update min_sdk_version from SdkSpec to ApiLevel" am: ddfab60014 am: f1058758db am: a14f1b45cb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2503257

Change-Id: I02d90d724f78eec72e7e7d6f80c2c2d15e25e9f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 18:38:52 +00:00
Spandan Das
ddfab60014 Merge "Update min_sdk_version from SdkSpec to ApiLevel" 2023-03-23 16:33:36 +00:00
Yi Kong
fd07ed2c14 Revert^2 "Update clang version to clang-r487747"
9ede280375

Bug: 264965700
Change-Id: I4154c70c050a825525d5b591fa757104eb78c158
2023-03-23 14:14:31 +00:00
Treehugger Robot
ad0f2fbcb0 Merge "Disable musl in mixed Bazel builds" am: 62d3353434 am: b8573f8823 am: 62db2906f1 am: 6bedb8f914
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2501018

Change-Id: I1ea7b803ca5f344b3fc2b688e9c343f100c94cd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 09:03:05 +00:00
Treehugger Robot
6bedb8f914 Merge "Disable musl in mixed Bazel builds" am: 62d3353434 am: b8573f8823 am: 62db2906f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2501018

Change-Id: Ia5c40a6010782bd2f8ed3c712d9bfa4937bba31a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 08:24:50 +00:00
Treehugger Robot
62d3353434 Merge "Disable musl in mixed Bazel builds" 2023-03-23 06:35:30 +00:00
Jooyung Han
4973d45d06 Add t.helper() to AssertStringListContainsEquals
Bug: n/a
Test: m nothing
Change-Id: I49d87ac75edbc4856eb5a178c9085134a4185487
2023-03-23 14:22:46 +09:00
Spandan Das
15f36540fb Merge changes I10e8bea5,I8e013ec1 am: 7947b31a55 am: 5bb11946d3 am: d573508c93 am: eb0eface10
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2499917

Change-Id: Ieb06fe46f8c1d606d31c89129b080637e23f10ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 22:20:16 +00:00
Liz Kammer
7d3d473729 Disable modules in mixed builds. am: f235505c9f am: c466ccccef am: 4ae2ccede7 am: 2227a9d36d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2502535

Change-Id: I0a7cbe1093923c2058de8dfda8405c2748373f03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 22:19:44 +00:00
Spandan Das
eb0eface10 Merge changes I10e8bea5,I8e013ec1 am: 7947b31a55 am: 5bb11946d3 am: d573508c93
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2499917

Change-Id: Ie7d4d85f9448f4d9f8bc884ac5a96a96994046f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 21:19:07 +00:00
Liz Kammer
2227a9d36d Disable modules in mixed builds. am: f235505c9f am: c466ccccef am: 4ae2ccede7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2502535

Change-Id: Ia803590bf12c14b0b639d0eb428125357f29ad00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 21:18:08 +00:00
Liz Kammer
ae3db4c13e Merge "Add missing deps for neuralnetworks/swcodec" am: 448bbfb083 am: d0e1dff92e am: 66fae6e3a4 am: 03d8859bda
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2498216

Change-Id: Ie3e1139935c59e9c5fadea1851385a8ff93ca9c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 20:48:26 +00:00
Liz Kammer
52b9a46d28 Merge "add parent static deps to cc_aidl_library targets" am: d42d738fda am: 847e88c268 am: 2c4b1776ab am: f5f803cad0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494983

Change-Id: Idfd7d91b38380b7ca6aa5607568d8b198f2d7ebb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 20:24:08 +00:00
Spandan Das
8c9ae7ed67 Update min_sdk_version from SdkSpec to ApiLevel
This relands aosp/2457063. The original change broke T and U since those
branches still contain soong modules of type (kind+level). Those soong
modules have been cleaned up now

Test: Used go/abtd to test T and U branches with this change

Bug: 208456999
Change-Id: I0ef7933c055f88cb512a02108f1173e51156ef1c
2023-03-22 20:15:45 +00:00
Colin Cross
5dc62c9456 Add sanitizer tests for musl
Add tests that verify sanitizer behaviors for musl.

Test: sanitize_test.go
Change-Id: I1f0a51cc103ac14d1738cb223e216ee0e32d8550
2023-03-22 12:58:38 -07:00
Colin Cross
9e87f0a6ea Disable musl in mixed Bazel builds
Test: builds
Bug: 259266326
Change-Id: I4492f6b585d35fe848d5dc255043960c69742dcb
2023-03-22 12:58:37 -07:00
Spandan Das
7947b31a55 Merge changes I10e8bea5,I8e013ec1
* changes:
  Create EffectiveVersion* functions for ApiLevel
  Create two sentinel api levels
2023-03-22 19:57:52 +00:00
Yu Liu
7977650c49 Add neuralnetworks to the mixed build staging list.
Related tests modules will be added later.

Bug: None
Test: CI
Change-Id: I1ff66cdf327ae2bf214f87522a302a1957fed3c6
2023-03-22 17:03:36 +00:00
Jeongik Cha
e114e60615 Add HINT_FROM_SOONG option for ninja weight list
If this option is set, Soong generates ninja weight list including
modules in HugeModulesList in allowlists.go

Test: m --ninja_weight_source=soong
Bug: 273282046
Change-Id: Id92b7f9f9e8152c1c46ae071c5821a479cf47bce
2023-03-23 01:45:27 +09:00
Liz Kammer
03d8859bda Merge "Add missing deps for neuralnetworks/swcodec" am: 448bbfb083 am: d0e1dff92e am: 66fae6e3a4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2498216

Change-Id: Ia9d3c9c84c3ba29569514faa5ac7beac584e70e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 16:22:06 +00:00
Liz Kammer
f5f803cad0 Merge "add parent static deps to cc_aidl_library targets" am: d42d738fda am: 847e88c268 am: 2c4b1776ab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494983

Change-Id: I525e802f67ea476384aa2f12c4b44cd6f6673d34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 16:14:37 +00:00
Liz Kammer
f235505c9f Disable modules in mixed builds.
Test: m --bazel-mode-dev hwuimicro
Change-Id: If55763b35c931571e317993bd707de027d647e59
2023-03-22 11:14:57 -04:00
Liz Kammer
9af3fb17f6 Merge "Disable riscv in all Bazel mixed builds" am: 9d8e0158de am: afc9fbef80 am: 5630f45b36 am: 376b2df426
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2499735

Change-Id: I5fee8137afc96f8b618140ceb58ab84419b0269a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 15:00:05 +00:00
Liz Kammer
448bbfb083 Merge "Add missing deps for neuralnetworks/swcodec" 2023-03-22 14:45:27 +00:00
Liz Kammer
d42d738fda Merge "add parent static deps to cc_aidl_library targets" 2023-03-22 14:43:57 +00:00
Liz Kammer
376b2df426 Merge "Disable riscv in all Bazel mixed builds" am: 9d8e0158de am: afc9fbef80 am: 5630f45b36
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2499735

Change-Id: Id8eeac03b742abc331f0e291e9c6ceb74c143bf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 14:19:53 +00:00
Liz Kammer
9d8e0158de Merge "Disable riscv in all Bazel mixed builds" 2023-03-22 12:19:26 +00:00
Liz Kammer
e76510ba32 Add missing deps for neuralnetworks/swcodec
Test: b build --config=android //hardware/interfaces/...
Change-Id: I458684d511af0e4858956bbb00b42be7d79538e0
2023-03-21 16:49:13 -04:00
Sam Delmerico
512437b0b4 add parent static deps to cc_aidl_library targets
The static deps of the parent library can be necessary to build a
bp2build-generated cc_aidl_library target. We should add these deps as
implementation_deps so that they are accessible.

Bug: 250876486
Test: b build //frameworks/native/libs/gui/...
Change-Id: Ibe7c3598a684907473e2a4e040fb3976455a59e9
2023-03-21 16:49:06 -04:00
Spandan Das
70bf803765 Merge "Cleanup hardcoded references to android_*stubs_current" am: ef5b7e4e36 am: 91d512df2c am: 543629b206 am: fd099f5ca1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2497416

Change-Id: I6c86b53fab5af5c2ca76c354fb166d854a675d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 19:45:58 +00:00
Treehugger Robot
2f0c5aded7 Merge "Replace json_encode with json.encode" am: c164b460d0 am: 65a4f6c374 am: b230d9ffaa am: e311a8452a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2496596

Change-Id: I3a4597a40d211c29f196c39ba59cca1dadd9b987
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 19:45:30 +00:00
Spandan Das
fd099f5ca1 Merge "Cleanup hardcoded references to android_*stubs_current" am: ef5b7e4e36 am: 91d512df2c am: 543629b206
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2497416

Change-Id: I2f54ca73b7ee6c9a98cd205f259cdfd003909647
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 19:06:07 +00:00
Treehugger Robot
e311a8452a Merge "Replace json_encode with json.encode" am: c164b460d0 am: 65a4f6c374 am: b230d9ffaa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2496596

Change-Id: I39cbd6a85dcdac0df4db6094ccb295f3fc2953d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 19:05:34 +00:00
Spandan Das
dd7057c715 Create EffectiveVersion* functions for ApiLevel
This relands aosp/2457062. The original CL was submitted as part of a
stack that broke tm and udc. Those branches still contain soong modules
with min_sdk_version of type (kind+level).

Bug: 208456999
Test: m nothing on tm and udc (via go/abtd)
Change-Id: I10e8bea59cd5914d36b2c9539ee1556e55b82e53
2023-03-21 17:37:57 +00:00
Spandan Das
15da5887fe Create two sentinel api levels
This relands aosp/2470068. The original CL was submitted as part of a
stack that broke tm and udc. Those branches still contain soong modules
with min_sdk_version of type (kind+level).

Test: m nothing on tm and udc (via go/abtd)
Bug: 208456999

Change-Id: I8e013ec10530372f70f0ab0505b7eebeee2b360b
2023-03-21 17:37:49 +00:00
Spandan Das
ef5b7e4e36 Merge "Cleanup hardcoded references to android_*stubs_current" 2023-03-21 17:22:42 +00:00
Treehugger Robot
c164b460d0 Merge "Replace json_encode with json.encode" 2023-03-21 17:21:18 +00:00
Liz Kammer
75b36c165f Disable riscv in all Bazel mixed builds
Bug: 262192655
Test: CI
Change-Id: Ie46eb661f968396f40458d674897b554be8d47c3
2023-03-21 09:28:14 -04:00
Spandan Das
2c578b5c45 Merge changes from topic "revert-2457063-EKFSKANQWZ" am: cd05792d06 am: d3d9c4ae59 am: 12992d3db9 am: f4149e51ce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2499159

Change-Id: Idc23991a9a423005037e629015daa05f6095a84a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 04:03:03 +00:00
Spandan Das
f4149e51ce Merge changes from topic "revert-2457063-EKFSKANQWZ" am: cd05792d06 am: d3d9c4ae59 am: 12992d3db9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2499159

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

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

Change-Id: Ib88871a47c637dd3e4ed33dea0bfb1dc6b85a472
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 01:56:35 +00:00
Liz Kammer
468f8bb7e8 Merge "Add documentation for BuildParams" am: 071c76e223 am: a42a6712db am: 0f755853d7 am: 818471f57f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2490500

Change-Id: Ia8b22b597f766109e43d8f5c5e198e36f93d2f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 01:56:22 +00:00
Spandan Das
cd05792d06 Merge changes from topic "revert-2457063-EKFSKANQWZ"
* changes:
  Revert "Create two sentinel api levels"
  Revert "Create EffectiveVersion* functions for ApiLevel"
  Revert "Prework for migrating min_sdk_version from (kind+level) ..."
  Revert "Always include host variants in the sdk snapshot"
  Revert "Update min_sdk_version from SdkSpec to ApiLevel"
2023-03-21 01:56:16 +00:00
Liz Kammer
1bd8caf94a Merge "Move fingerprint genrule and DCLA cc libraries to prod allowlists." am: 063b5773b3 am: ab2ddad59e am: 1a5ed337eb am: 4487dd1902
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2497036

Change-Id: Ifecfb1c9043a4acf0eb433c9dc547ed46d58b18e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 01:53:58 +00:00