StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,236 Commits 1 Branch 0 Tags
d2daabfa022c7abd5575f5a8a4c21e600b5ba58d
Commit Graph

3058 Commits

Author SHA1 Message Date
Treehugger Robot
f31eb7ded3 Merge "Remove obsolete notice property." am: 0ea404eb36 am: 13d06a134f am: 941ca2a81d am: 054a7691c7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2156349

Change-Id: I45e40a639aac2b0de6ce07e69a19ad3f64f63ca7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 18:53:54 +00:00
Treehugger Robot
13d06a134f Merge "Remove obsolete notice property." am: 0ea404eb36 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2156349

Change-Id: Ib08598705dbf4904d50f18b1b1c5c206557cf197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 17:46:17 +00:00
Treehugger Robot
0ea404eb36 Merge "Remove obsolete notice property." 2022-08-02 17:22:42 +00:00
Jingwen Chen
c71569ef5d Export default apex version from updatable_modules.go to Bazel's am: 7810e17e54 am: 88516533e1 am: 0e0dd7d4c7 am: 08f1333ec8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2168944

Change-Id: I56bc811860f0953652de4fb1ca90e9a9d0adb3c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 13:20:34 +00:00
Jingwen Chen
88516533e1 Export default apex version from updatable_modules.go to Bazel's am: 7810e17e54 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2168944

Change-Id: Ic5fde55e1dc90d60772635458f16e5626cf8b41c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 12:21:45 +00:00
Alexei Nicoara
f99fac8f5a Merge "Moving default version outside of apex package" am: 21b027dca8 am: 18ecb86247 am: 65e6a8c7b9 am: 4e1ef5f5b2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2167105

Change-Id: I262912a958483563fe88a66d1fec600fc36b3617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 11:21:46 +00:00
Jingwen Chen
7810e17e54 Export default apex version from updatable_modules.go to Bazel's 
apex_toolchain through soong_injection.

This is necessary to keep both Bazel and Soong in sync.

Test: presubmit
Bug: 238723069
Fixes: 238153998

Change-Id: Ibf4a8ed91d358dc7800c10e4112485a52f0606bb
 2022-08-02 10:11:36 +00:00
Alexei Nicoara
18ecb86247 Merge "Moving default version outside of apex package" am: 21b027dca8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2167105

Change-Id: I92100d519f4744678a4c1082c460daddc085cb56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 09:18:23 +00:00
Alexei Nicoara
7579b67ef9 Moving default version outside of apex package 
The default version needs to be used by both apex and apk updatable
modules. Moving it to android package so it can be accessed without
circular dependencies.

Test: presubmit
Bug: 231691162

Change-Id: Icafd50d0b065e89a115ae9c9b6ea55adf2730b49
Merged-In: Icafd50d0b065e89a115ae9c9b6ea55adf2730b49
 2022-08-01 16:28:48 +01:00
Treehugger Robot
88f1d5d368 Merge "Implement mixed builds for apex modules, take 2." am: 88e7512572 am: 953254b150 am: 1c0be10898 am: e4fe8254fe 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2167802

Change-Id: If608e5c6aaaabcef7c2586a19f6779cca91910d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-30 00:26:42 +00:00
Treehugger Robot
953254b150 Merge "Implement mixed builds for apex modules, take 2." am: 88e7512572 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2167802

Change-Id: I9efd3c2e6f8c93aa8d1add3cbe6802e24d73b084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-29 23:06:00 +00:00
Treehugger Robot
88e7512572 Merge "Implement mixed builds for apex modules, take 2." 2022-07-29 22:43:19 +00:00
Bob Badour
0cc5facf79 Remove obsolete notice property. 
Bug: 192434786

Test: m droid dist

Change-Id: I0f384ae895cebab9732448b82db600c67eb8f711
 2022-07-29 17:54:40 +00:00
Sasha Smundak
fe9a5b833d Implement mixed builds for apex modules, take 2. 
* Add ApexCqueryInfo to obtain apex artifacts used by the makefile
  generator and downstream modules
* Refactor code common to GenerateAndroidBuildActions and ProcessBazelQueryResponse
* Implement android.MixedBuildBuildable for modules
* Enable mixed build for apex modules with payload_type:"image"

The first take 6a2b7c40b was setting compressed APEX suffix incorrectly, and
was reverted in 8a3c91494.

Fixes: 239925080 239695521 232085015
Test: treehugger
Change-Id: I1720f8db3c7cc773183d25a815d9b7eeaf7c73ad
 2022-07-28 14:43:50 -07:00
Ken Chen
adc07dce61 Merge "Disallow '_' in bpf source name" am: d8cded58fe am: 9b259932f7 am: 8219d90a58 am: 318d8c51f2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2147825

Change-Id: Ib33a7069c9301d4836694f16fb5926f6ec5d8415
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-28 08:50:51 +00:00
Ken Chen
9b259932f7 Merge "Disallow '_' in bpf source name" am: d8cded58fe 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2147825

Change-Id: Ia3ea5b08ccd37f096ad7d9cd053a45b25b045ba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-28 07:21:56 +00:00
Ken Chen
d8cded58fe Merge "Disallow '_' in bpf source name" 2022-07-28 07:00:12 +00:00
Martin Stjernholm
49e037486b Merge "Revert "Implement mixed builds for apex modules."" am: 0bb7f0494e am: 2fb081fd28 am: 3346a24aef am: 87b3ef440b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2165026

Change-Id: I277e0641c4423109c5f8b42b275d8e462f2d891e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-26 16:04:08 +00:00
Martin Stjernholm
2fb081fd28 Merge "Revert "Implement mixed builds for apex modules."" am: 0bb7f0494e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2165026

Change-Id: I375077ee73ba18308d0841ca76956757935dd992
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-26 14:08:18 +00:00
Martin Stjernholm
0bb7f0494e Merge "Revert "Implement mixed builds for apex modules."" 2022-07-26 13:52:18 +00:00
Martin Stjernholm
8a3c914942 Revert "Implement mixed builds for apex modules." 
Revert submission 2147387-mixed_builds

Reason for revert: Breaks zipapex build on git_master-art-host
Bug: 239925080
Reverted Changes:
I9f1e03e5e:Implement mixed builds for apex modules.
I13d9a0270:Add container and bundle encription key pairs to t...

Change-Id: I0eaad4dd81cac16d634f4c9cec18137a38e30d47
 2022-07-26 09:35:39 +00:00
Paul Duffin
e3e8ba7745 Merge "Export any platform_compat_config used by apex to sdk snapshot" am: 69d09f49ec am: fa26f65155 am: 4dcb86de2c am: a984b2b876 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2160797

Change-Id: I416dc6c804b2b110946d879f10fcbe1b5683132e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-21 23:39:41 +00:00
Paul Duffin
fa26f65155 Merge "Export any platform_compat_config used by apex to sdk snapshot" am: 69d09f49ec 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2160797

Change-Id: Icb98af219a66d7ad48518ac49c6150798361f62b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-21 22:29:39 +00:00
Paul Duffin
fcf79850d8 Export any platform_compat_config used by apex to sdk snapshot 
Previously, the platform_compat_config modules needed to be explicitly
listed in the sdk snapshot and the apex. This change will automatically
export them to the sdk snapshot when the apex is listed in its apexes
property.

Bug: 232401814
Test: m tethering-module-sdk
      # Before this change the generated snapshot did not contain the
      # platform_compat_config, after this change it did.
      m art-module-sdk
      # As that explicitly specifies the platform_compat_config in its
      # compat_configs property this change has no effect.
Change-Id: Ia854b9a52db2b1619fca41a387ce98d7f9f9efe9
 2022-07-20 14:18:24 +00:00
Alexander Smundak
8e728f144e Merge "Implement mixed builds for apex modules." am: 9ec1ff98b7 am: f7ccf8c822 am: 34a6bda87e am: 035e5fddd8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2104104

Change-Id: I65ea31f7232738d87ed3319c684475fa7d44d561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 15:01:44 +00:00
Alexander Smundak
f7ccf8c822 Merge "Implement mixed builds for apex modules." am: 9ec1ff98b7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2104104

Change-Id: I1fb794735088c8d69bd425cbe6a9d4b62b9ca43d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 13:59:21 +00:00
Alexander Smundak
9ec1ff98b7 Merge "Implement mixed builds for apex modules." 2022-07-19 13:38:55 +00:00
Treehugger Robot
ba126223e4 Merge changes I0484ea34,I188e4824 am: b3f18a9f9f am: 03c590b4e1 am: bc5a0199e9 am: 3283d6c8d2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2153678

Change-Id: I067e38c5db2f7b09820df4c3c45b3ffefcade38e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 07:44:47 +00:00
Treehugger Robot
03c590b4e1 Merge changes I0484ea34,I188e4824 am: b3f18a9f9f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2153678

Change-Id: I412a85473760a3dc7915984d013350edb00ad74b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 06:44:19 +00:00
Jiyong Park
85cc35a143 Distinguish # apex and # systemapi symbols 
Previously, the symbol tag `# apex` was treated the same as `#
systemapi`. With this CL, they have different meanings.

`# systemapi`: APIs that are defined in the platform (the non-updatable
part), and are exposed to unbundled system components like APEX

`# apex`: APIs that are defined in the APEX and are exposed to the
platform or other APEXes

Bug: 239274367
Test: m
Change-Id: I0484ea349656dbbd337e5fe3a5970f0ad275b807
 2022-07-19 13:47:19 +09:00
Sasha Smundak
6a2b7c40b3 Implement mixed builds for apex modules. 
* Add ApexCqueryInfo to obtain apex artifacts used by the makefile
  generator and downstream modules
* Refactor code common to GenerateAndroidBuildActions and ProcessBazelQueryResponse
* Implement android.MixedBuildBuildable for modules
* Enable mixed build for apex modules with payload_type:"image"

Bug: 232085015
Test: treehugger
Change-Id: I9f1e03e5e7a5b5dde35a5db10c253069543ac973
 2022-07-18 13:34:36 -07:00
Alexei Nicoara
d4ffbcacb6 Merge "Cleaning up comment removal and version replacement" am: 74788ec25e am: 2276889374 am: 6ed3b0b41a am: b003b289d1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2151256

Change-Id: Ieebac0a5127ab28f4ad4dc5282fcb4ba7f20f386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-13 12:31:05 +00:00
Alexei Nicoara
2276889374 Merge "Cleaning up comment removal and version replacement" am: 74788ec25e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2151256

Change-Id: I4ca57f41efd50def2c4a204e34d1567f9e6f5d1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-13 11:37:59 +00:00
Alexei Nicoara
e2d0984654 Merge changes Ibcf908d9,I786ab152 am: 1e3d27821b am: 6a5cdc7c19 am: 2426047290 am: a5642cbdfb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2149659

Change-Id: I4879ce2b54a55eb33d942e1c714119addf411d6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 14:37:35 +00:00
Alexei Nicoara
0a3892031e Cleaning up comment removal and version replacement 
jsonmodify is now responsible for striping the comments and replacing the placeholder  version with the defaule one. Cleaning up the old code.

Test: presubmit
Bug: 231691643
Change-Id: I09af00199aefec09b2d5995b2923525a3a42c362
 2022-07-12 14:50:48 +01:00
Alexei Nicoara
6a5cdc7c19 Merge changes Ibcf908d9,I786ab152 am: 1e3d27821b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2149659

Change-Id: I59debb4001f86899d6116df849088db60832e3c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 13:28:03 +00:00
Alexei Nicoara
d887e24260 Cleaning up the version sed rule 
Bug: 231691643
Test: presubmit, checked itermediary jsons
Change-Id: Ibcf908d9365ab41e5a19211f5a60305a0896dea5
 2022-07-12 11:53:21 +01:00
Alexei Nicoara
e938002c24 Merge "Replace version 0 with the default version" am: 2971a94e4c am: 656399f062 am: 2668973418 am: c34e227419 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2149073

Change-Id: Ib16bec5543d9bba6eed411a7dd27e6137bc18ac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-11 11:29:37 +00:00
Alexei Nicoara
656399f062 Merge "Replace version 0 with the default version" am: 2971a94e4c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2149073

Change-Id: Iab0a62bca5829017965ad2dfdf85423792ff7733
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-11 09:31:10 +00:00
Alexei Nicoara
e922d2139d Replace version 0 with the default version 
Having 0 as the default version causes problems in flattened apexes and
is being parsed in protobuf as non-existing field. It will be hard to
revert 100 of commits for all the modules. Changing the version in soong
to mitigate time impact.

Test: presubmit, checked .intermediary jsons
Bug: 231691643
Change-Id: I451186d79fd9f8345fd4e28d9daadbfc59047445
 2022-07-08 17:38:52 +01:00
Paul Duffin
3611e6609d Merge "Add apexes property to sdk" am: 0d89b3dc27 am: 4057d6455a am: da014983b3 am: 00e64f4aa0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2096447

Change-Id: Icaef07d099761c689ce7556b04b655971f30b4c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-07 12:08:22 +00:00
Ken Chen
5372a24375 Disallow '_' in bpf source name 
Current design:
1. The bpf compiled object name is derived from the source name
   (e.g. foo.c -> foo.o).
2. Full bpf program/map name are concatenated by object name + '_' +
   program/map name in run-time. (e.g. obj name: x.o; program name: y_z;
   full bpf program name will be x_y_z)

Issue:
x.o with map y_z and x_y.o with map z can cause naming collision in
run-time, since both result in x_y_z. This commit prevents it from
happening with a build-time check.

Bug: 236706995
Test: m
Change-Id: Ic03bfcf07a5748ed63246b71d5ae8de0405e658a
 2022-07-07 20:02:28 +08:00
Paul Duffin
4057d6455a Merge "Add apexes property to sdk" am: 0d89b3dc27 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2096447

Change-Id: Ib57f709febd0827967afcd301825d7dae568b67a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-07 10:59:52 +00:00
Paul Duffin
0d89b3dc27 Merge "Add apexes property to sdk" 2022-07-07 10:40:00 +00:00
Treehugger Robot
f26e6d0f5f Merge "Passing default version to zipApex as well" am: 87d74dc54e am: 97bc4873db am: 52939c2ec8 am: e099d90bd5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2146859

Change-Id: Ic26807d0a4d0c6c8e93b3ab95cb5212f0d0dd78a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 19:14:08 +00:00
Treehugger Robot
97bc4873db Merge "Passing default version to zipApex as well" am: 87d74dc54e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2146859

Change-Id: I08367146ccb17bc16ad6d612c1470f850b469955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 18:21:11 +00:00
Treehugger Robot
87d74dc54e Merge "Passing default version to zipApex as well" 2022-07-06 17:42:34 +00:00
Paul Duffin
4e7d1c43e2 Add apexes property to sdk 
Specifying an apex in the apexes propety will cause all the
*classpath_fragments that are contents of the APEX to be automatically
added as members of the sdk and appear in the snapshot.

The purpose of this change is to dedup the APEX and sdk definitions and
try and avoid some of the issues that we have been finding while
attempting to build against the prebuilts.

Two tests, one each for bootclasspath_fragment and
systemserverclasspath_fragment, have been refactored to compare the
output when adding the *fragment to the sdk directly of via the APEX.
That ensures switching to use the APEX will not change the sdk snapshot
unless it was previously missing a *fragment.

There was also a slight difference in where the hidden API flags were
copied from. That should have no impact on the output as the flags are
identical.

The sdk snapshot generation needed some tweaks to avoid generating a
prebuilt for the APEX.

Bug: 232401814
Test: m nothing
Change-Id: I7aaf16a3a0ab4bebf97765d1484215cc008dc4b8
 2022-07-06 15:58:43 +00:00
Alexei Nicoara
c939b0181d Passing default version to zipApex as well 
Test: presubmit
Bug: 231691643
Change-Id: Ic751d7ea2d23180855897702a03bf1b589d7ef80
 2022-07-06 13:56:50 +01:00
Alexei Nicoara
919fc29377 Merge "Removing comment lines from apex_manifest.json" am: f6152a161b am: 663d7560da am: 5bb9d3e85d am: 8a9f099c34 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2142072

Change-Id: Iadfc5433db3a40e8397f3ee566b2a21f707c94cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-01 15:20:43 +00:00