StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,175 Commits 1 Branch 0 Tags
f3d901b71d0f768e30233d74feca0332308d917d
Commit Graph

46175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
10470b9373 Merge changes I67c5022b,I3baa2535 am: 2e65f41953 am: f40148060b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832259

Change-Id: Ideeedb69c210160890cf4c31b2954a8ac29b3d4f
 2021-09-23 14:48:53 +00:00
Treehugger Robot
f40148060b Merge changes I67c5022b,I3baa2535 am: 2e65f41953 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832259

Change-Id: Idd0df37d03a2ac22c1e9e03a34cee680c4ad37c9
 2021-09-23 14:37:07 +00:00
Treehugger Robot
2e65f41953 Merge changes I67c5022b,I3baa2535 
* changes:
  Detect duplicates in sdkRegistry
  Dedup SdkMemberType/TraitRegistry
 2021-09-23 14:21:05 +00:00
Ulyana Trafimovich
e972139b7e Merge "Move copy rule for system server jars from dexpreopt_gen to makefiles." am: a01d5ef403 am: 86cc6e64ba 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832253

Change-Id: I10997b2786c648c899b87443bf2d7f37e3b104d7
 2021-09-23 13:25:59 +00:00
Paul Duffin
d268c73cf9 Merge "Removes usages of SdkMemberTrait/TypeRegistry outside android/sdk.go" am: 0a7428073c am: ba27bee268 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832257

Change-Id: I110c6f8d9cf53efeba126f6f97c49e0754e4b900
 2021-09-23 13:25:50 +00:00
Paul Duffin
f260c92e1f Merge "Add support for native bridge trait" am: 15e92388bb am: 8aae014264 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1827878

Change-Id: I7a4f3f4adcc5e7d4f80ba48a72cab781da4027bd
 2021-09-23 13:24:03 +00:00
Jerome Gaillard
9a7926f982 Merge "Fix path to layoutlib project" am: f346429e0e am: 8467166b0c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834613

Change-Id: Id7e031a177fdafe829de3c643ebb3416de84ee73
 2021-09-23 13:23:57 +00:00
Ulyana Trafimovich
86cc6e64ba Merge "Move copy rule for system server jars from dexpreopt_gen to makefiles." am: a01d5ef403 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832253

Change-Id: I4fe102d22dd86b2f738b1b07ee17c635f32763ea
 2021-09-23 13:23:54 +00:00
Paul Duffin
26e7ff0cc8 Merge "Allow sdk snapshot code to identify native bridge variants" am: 6949183f34 am: 1cf903b3f0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1827877

Change-Id: Ib60ebbd746d0a3c454b23d022f59210929ed5304
 2021-09-23 13:23:52 +00:00
Paul Duffin
ea03a65869 Merge "Add support to sdk/module_exports to specify required traits" am: 95a1d1672f am: adaec6a171 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1827876

Change-Id: I0f14eb068c1aceae8c79d52c990f580de564fb80
 2021-09-23 13:23:42 +00:00
Ulyana Trafimovich
a01d5ef403 Merge "Move copy rule for system server jars from dexpreopt_gen to makefiles." 2021-09-23 13:20:49 +00:00
Paul Duffin
ba27bee268 Merge "Removes usages of SdkMemberTrait/TypeRegistry outside android/sdk.go" am: 0a7428073c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832257

Change-Id: I76136aafd4443f43731d82760fdc36f7be6dbc3b
 2021-09-23 13:07:55 +00:00
Paul Duffin
0a7428073c Merge "Removes usages of SdkMemberTrait/TypeRegistry outside android/sdk.go" 2021-09-23 13:05:41 +00:00
Paul Duffin
8aae014264 Merge "Add support for native bridge trait" am: 15e92388bb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1827878

Change-Id: I286209ee993de44cc508ca9449e73a55846dac33
 2021-09-23 13:03:35 +00:00
Jerome Gaillard
8467166b0c Merge "Fix path to layoutlib project" am: f346429e0e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834613

Change-Id: I931d20bb43cf0c3294c5c2746da828ac06914e17
 2021-09-23 13:03:27 +00:00
Paul Duffin
1cf903b3f0 Merge "Allow sdk snapshot code to identify native bridge variants" am: 6949183f34 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1827877

Change-Id: Ie841bc9fc0c831b00761a1b702894ae7cd2a67fc
 2021-09-23 13:03:21 +00:00
Paul Duffin
adaec6a171 Merge "Add support to sdk/module_exports to specify required traits" am: 95a1d1672f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1827876

Change-Id: I459f5843376c4ec281b6bbced07e6b60657c4070
 2021-09-23 13:03:13 +00:00
Paul Duffin
15e92388bb Merge "Add support for native bridge trait" 2021-09-23 13:02:50 +00:00
Jerome Gaillard
f346429e0e Merge "Fix path to layoutlib project" 2021-09-23 12:57:32 +00:00
Paul Duffin
6949183f34 Merge "Allow sdk snapshot code to identify native bridge variants" 2021-09-23 12:54:29 +00:00
Paul Duffin
95a1d1672f Merge "Add support to sdk/module_exports to specify required traits" 2021-09-23 12:51:42 +00:00
Jerome Gaillard
655ee02d29 Fix path to layoutlib project 
It is in the 'frameworks/layoutlib' folder and not in 'framework/layoutlib'.

Change-Id: I437558a0afa8bfaac0226b1e4c5a7c0a983b180a
 2021-09-23 11:38:11 +00:00
Paul Duffin
581f2e5f79 Detect duplicates in sdkRegistry 
Bug: 195754365
Test: m nothing
Change-Id: I67c5022b7cc61891fd6b90365f8271d97d7bcd98
 2021-09-23 11:37:57 +01:00
Paul Duffin
30c830b82a Removes usages of SdkMemberTrait/TypeRegistry outside android/sdk.go 
In preparation for a refactoring that will dedup the registry code.

Bug: 195754365
Test: m nothing
Change-Id: I93e8485d588f5b4d6b5e2967da5dbef7b6c831ad
 2021-09-23 11:37:57 +01:00
Paul Duffin
93b750e2a0 Add support for native bridge trait 
Adds a native bridge trait that if required will cause a
cc_library_header module to generate a cc_prebuilt_library_headers with
native_bridge_supported: true. It will fail if the cc_library_header's
native bridge variant would produce native bridge specific properties,
distinct from the other architecture variants, in the generated
cc_prebuilt_library_headers.

Bug: 195754365
Test: m nothing
Change-Id: I282fbb9095de6c6af57cca4eb4260e2c6c2da8cc
 2021-09-23 11:37:57 +01:00
Paul Duffin
fefdb0bf0a Allow sdk snapshot code to identify native bridge variants 
Previously, the snapshot code ignored native bridge related arch
specific variants and only used the non native bridge variants. This
change enabled it to track native bridge variants too.

There is currently no support for creating native bridge specific
prebuilts so this ensures that any attempt to create one will fail
during generation of the snapshot with a clear message.

At the moment that error message cannot be tested by creating an sdk as
there is no way to add a dependency from the sdk onto a native bridge
variant. A follow up change will add the capability to test this
functionality through an sdk.

Bug: 195754365
Test: m nothing
Change-Id: I0494fdba9cc2ff013ea990d12d6a03a0a444bd5c
 2021-09-23 11:37:57 +01:00
Paul Duffin
f04033be81 Dedup SdkMemberType/TraitRegistry 
Bug: 195754365
Test: m nothing
Change-Id: I3baa2535fd21a47bea2229f13cf5eb166396fe79
 2021-09-23 11:37:57 +01:00
Paul Duffin
d19f894512 Add support to sdk/module_exports to specify required traits 
Currently, every sdk member of a specific module type has to be treated
in the same way as every other sdk member of that type. e.g. it is not
possible for an sdk member to use different variants to other members
of the same type.

Adding a new member type for each different way to treat the members is
not scalable as if there were N different ways treat a member then it
would require 2^N types for all the possible combinations.

This adds a new traits mechanism that allows the behavior of member
types to be customized per sdk member. Each member type can specify a
list of supported traits and customize its behavior based on which
traits are required for each member. A trait can be supported by
multiple different member types.

Bug: 195754365
Test: m nothing
Change-Id: I165ac80d208c0402d2a9ffa8085bba29562c19b7
 2021-09-23 11:37:51 +01:00
Anton Hansson
40ef0e9141 Merge "Add annotations.zip support to java_sdk_library" am: 86da9c6a3d am: 52b99b10f5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832255

Change-Id: I6a6b8a3484eccea2999c45c2d49aa8af4cac229b
 2021-09-23 10:02:18 +00:00
Anton Hansson
52b99b10f5 Merge "Add annotations.zip support to java_sdk_library" am: 86da9c6a3d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832255

Change-Id: Id5625d0cc95fa1d235ee5eed6c008b9f555f876b
 2021-09-23 09:49:26 +00:00
Anton Hansson
86da9c6a3d Merge "Add annotations.zip support to java_sdk_library" 2021-09-23 09:39:38 +00:00
Wei Li
bcd399479a Add bp2build converter for cc_genrule. 
Test: cc_genrule_conversion_test.go

Change-Id: I19290b417d6336020a15ba7fa772ee0c76c58225
 2021-09-23 05:41:20 +00:00
Sarah Chin
0322af503a Add IRadio modules to VNDK 
Test: build
Bug: 198331451
Change-Id: Ia468b563c6485464db56b3c9cdbae80de6b3f165
Merged-In: Ia468b563c6485464db56b3c9cdbae80de6b3f165
 2021-09-23 03:54:58 +00:00
Sarah Chin
d1cbc6eab0 Merge "Add IRadio modules to VNDK" into stage-aosp-master am: ef3dd96890 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15881182

Change-Id: I9e352510eafd860ce82a4f291c7a535336e73d49
 2021-09-23 03:09:29 +00:00
Sarah Chin
ef3dd96890 Merge "Add IRadio modules to VNDK" into stage-aosp-master 2021-09-23 02:58:32 +00:00
Dan Willemsen
bfe69ebc7f Disable protobuf deterministic randomness in soong_build am: 66213a64b2 am: 37c59d4351 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1833333

Change-Id: If576084e438ebee1415b5ef5a0785b039fe9dfcc
 2021-09-23 02:20:46 +00:00
Dan Willemsen
37c59d4351 Disable protobuf deterministic randomness in soong_build am: 66213a64b2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1833333

Change-Id: I4fb3329f5190111d840860eafe83b5d64f0b848e
 2021-09-23 02:07:37 +00:00
Joseph Murphy
69e65b3fcd Changes tree built Robolectric name 
Bug: b/194219998
Test: locally ran all in-tree Robolectric tests
Change-Id: If13583f6a2882e2e78d3004afc476debf6692df9
Merged-In: If13583f6a2882e2e78d3004afc476debf6692df9
 2021-09-23 00:48:34 +00:00
Dan Willemsen
66213a64b2 Disable protobuf deterministic randomness in soong_build 
Soong writes out text protos for the sbox manifests, and if those change
every time soong changes, we trigger rebuilds of significant portions of
the tree. This is very annoying when attempting to iterate on Soong, so
disable this functionality at the soong_build level.

Bug: 200727888
Change-Id: Icf21e1775a4c4200e983c1b8ac66ddd780d7c90c
 2021-09-22 15:07:53 -07:00
Romain Jobredeaux
b669398c45 remove redundant 'deps' section from template with 'exports' section. 
Test: pom2bp -regen prebuilts/sdk/current/support/BUILD.bazel
Bug: 198418951
Change-Id: I4d0e3d100d0e319473723a75077e2520fc1535e1
 2021-09-22 16:50:33 -04:00
Dan Willemsen
f17feb05d7 Merge "Add java_binary_host support for Windows" am: b13daf2ba7 am: e8273d7bb0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832212

Change-Id: I754592162b305de2f64089985f40ca195c229ab1
 2021-09-22 20:39:36 +00:00
Dan Willemsen
e8273d7bb0 Merge "Add java_binary_host support for Windows" am: b13daf2ba7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1832212

Change-Id: I689e0da48cde43581890a8f46e185825a9984035
 2021-09-22 20:27:45 +00:00
Dan Willemsen
b13daf2ba7 Merge "Add java_binary_host support for Windows" 2021-09-22 20:13:33 +00:00
Colin Cross
55639aee62 Merge changes I0b78ceeb,Ic57e1efd am: fac6fd0927 am: 2d1979da48 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1582568

Change-Id: I29d3b96c8337b29859411b84735497d237aff9f2
 2021-09-22 18:44:10 +00:00
Romain Jobredeaux
a2c081413a Exclude WallpaperPicker app and pom2bp-generated BUILD files from bp2build. 
Bug: 198418951
Test: b build packages/apps/WallpaperPicker
Change-Id: I86eb64c734eb262a497595f525027534cdabdf32
 2021-09-22 14:43:43 -04:00
Colin Cross
2d1979da48 Merge changes I0b78ceeb,Ic57e1efd am: fac6fd0927 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1582568

Change-Id: I813744db1537c5a81d56e8b9bd1f05f848de1a5c
 2021-09-22 18:30:49 +00:00
Colin Cross
fac6fd0927 Merge changes I0b78ceeb,Ic57e1efd 
* changes:
  Add environment variable to force keeping ANSI codes
  Disable table mode in smart status if window size is not available
 2021-09-22 18:19:15 +00:00
Romain Jobredeaux
9f773b2b4e Merge "Exclude directories with manual BUILD files from bp2build." am: f05bea080b am: 9ba010c641 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1822113

Change-Id: I63c155d655cf9cd143d0046a1c19363a69575854
 2021-09-22 18:02:54 +00:00
Joseph Murphy
c964841e2d Changes tree built Robolectric name 
Bug: b/194219998
Test: locally ran all in-tree Robolectric tests
Change-Id: If13583f6a2882e2e78d3004afc476debf6692df9
Merged-In: If13583f6a2882e2e78d3004afc476debf6692df9
 2021-09-22 17:58:07 +00:00
TreeHugger Robot
8c7089fde6 Merge "Changes tree built Robolectric name" into sc-dev-plus-aosp 2021-09-22 17:48:56 +00:00