Commit graph

55319 commits

Author SHA1 Message Date
zhidou
a2ce78f80d Make "overrides" attribute of Android_app overridable
Move overrides attribute from appProperties to overridableAppProperties

Bug: 220029162
Test: m
Change-Id: I6f527df3173f142311734333ad37018c83d5e279
2022-02-17 13:40:53 +00:00
Colin Cross
675695eb62 Merge "Add builtins and minimal runtime as dependencies instead of flags" am: 251d6500db am: 64ef5e9968 am: 5cf058abab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1980448

Change-Id: Ie4790bbc44955a4762316eb2bb9657dd63af0364
2022-02-16 20:45:22 +00:00
Colin Cross
5cf058abab Merge "Add builtins and minimal runtime as dependencies instead of flags" am: 251d6500db am: 64ef5e9968
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1980448

Change-Id: I8ea95bf8b1fa1360801bcff3df071d44ce117630
2022-02-16 20:35:50 +00:00
Colin Cross
64ef5e9968 Merge "Add builtins and minimal runtime as dependencies instead of flags" am: 251d6500db
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1980448

Change-Id: I7a6be55927b1d929634dde42d89ff38b54870c76
2022-02-16 19:33:25 +00:00
Colin Cross
251d6500db Merge "Add builtins and minimal runtime as dependencies instead of flags" 2022-02-16 18:59:55 +00:00
Treehugger Robot
5d01ad1d64 Merge "Keep build/bazel/ci/dist/BUILD for bp2build." am: 632d0a03ed am: 7eed46b65b am: 275f259a69
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1976970

Change-Id: I2e995ad181e8467e1c8e0f0834c0a31a6618172d
2022-02-16 17:30:49 +00:00
Treehugger Robot
275f259a69 Merge "Keep build/bazel/ci/dist/BUILD for bp2build." am: 632d0a03ed am: 7eed46b65b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1976970

Change-Id: Ifa4efd66a0637a04966f0a689ee8a0b2081b444c
2022-02-16 16:52:31 +00:00
Treehugger Robot
7eed46b65b Merge "Keep build/bazel/ci/dist/BUILD for bp2build." am: 632d0a03ed
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1976970

Change-Id: Ie155c4cb566de460825730b99a12a6b39f65f6fa
2022-02-16 16:30:33 +00:00
Jingwen Chen
203954d7e2 Add error_prone_checkerframework_dataflow_nullaway. to bp2build denylist. am: eb2a3fd367 am: 41bd3efc00 am: 17debc31f8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1988326

Change-Id: I31cc538ac96bc61bd1c814846c1b54226fb30868
2022-02-16 16:29:27 +00:00
Treehugger Robot
632d0a03ed Merge "Keep build/bazel/ci/dist/BUILD for bp2build." 2022-02-16 16:14:26 +00:00
Jingwen Chen
17debc31f8 Add error_prone_checkerframework_dataflow_nullaway. to bp2build denylist. am: eb2a3fd367 am: 41bd3efc00
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1988326

Change-Id: I5e24ed20677149c06136bbb6e45defcc61b59185
2022-02-16 16:10:47 +00:00
Jingwen Chen
41bd3efc00 Add error_prone_checkerframework_dataflow_nullaway. to bp2build denylist. am: eb2a3fd367
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1988326

Change-Id: I8d13f62cbc4cb2915895032d7b2f08f58af8c807
2022-02-16 15:49:23 +00:00
Jingwen Chen
eb2a3fd367 Add error_prone_checkerframework_dataflow_nullaway. to bp2build denylist.
Bug: 219908977
Change-Id: Ia6a0879d9af7aabadb5cd5722ddfdf72f579e621
Test: CI
2022-02-16 13:03:29 +00:00
Treehugger Robot
1cc29d1787 Merge "Compare tidy_disabled_srcs list by string values" am: ec76c2f072 am: 9f60d66aa9 am: 835b8ef450
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1987286

Change-Id: I57c369f5c2f457bd386d2f513857691ecb6312d4
2022-02-16 05:24:51 +00:00
Justin Yun
72d1e43ff8 Fix rust snapshot to capture static libs correctly am: 2b3ed6403c am: eb4973029e am: 5c76404fb5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1987146

Change-Id: I12cfdd35868e0ed3074fd25579c8fc009d700f6b
2022-02-16 05:23:49 +00:00
Treehugger Robot
835b8ef450 Merge "Compare tidy_disabled_srcs list by string values" am: ec76c2f072 am: 9f60d66aa9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1987286

Change-Id: Ie9873f6bb3b0464ee80b6db0c50eb07b38df54ae
2022-02-16 05:03:44 +00:00
Justin Yun
5c76404fb5 Fix rust snapshot to capture static libs correctly am: 2b3ed6403c am: eb4973029e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1987146

Change-Id: Idf13620a4653b25258eeeeaa71d93cb6715e2d0e
2022-02-16 05:03:36 +00:00
Treehugger Robot
9f60d66aa9 Merge "Compare tidy_disabled_srcs list by string values" am: ec76c2f072
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1987286

Change-Id: I98591dd50642311fba99ae36d8d2561372263851
2022-02-16 03:30:43 +00:00
Justin Yun
eb4973029e Fix rust snapshot to capture static libs correctly am: 2b3ed6403c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1987146

Change-Id: I21adc3985b5ae2c0932ea3a0c58b254f53f7d2d7
2022-02-16 03:30:33 +00:00
Treehugger Robot
ec76c2f072 Merge "Compare tidy_disabled_srcs list by string values" 2022-02-16 03:02:37 +00:00
Chih-Hung Hsieh
8439a141a7 Compare tidy_disabled_srcs list by string values
* Cannot use android.Path as key because some srcs and
  and tidy_disabled_srcs items could have the same path
  string but different android.Paths objects.

Bug: 219783146
Test: make tidy-soong_subset
Change-Id: I82e25ec9678ce998feccf361d69ae66dae0905de
2022-02-15 15:32:57 -08:00
Justin Yun
2b3ed6403c Fix rust snapshot to capture static libs correctly
SnapshotStaticLibs must include static libs, but it had shared libs.

Bug: 219746113
Test: build vendor snapshot
Change-Id: I0660811bb94446129ae97f52306b065dec73cabd
2022-02-16 08:15:07 +09:00
Liz Kammer
8116463868 Merge "Correct bp2build canonical_from_root logic" am: 5ee913f527 am: 4902daf52f am: 681fcc21db
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1985613

Change-Id: I1723b3a111462ed4ca32e2afe43c80ac2b50230e
2022-02-15 21:32:05 +00:00
Liz Kammer
681fcc21db Merge "Correct bp2build canonical_from_root logic" am: 5ee913f527 am: 4902daf52f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1985613

Change-Id: I80e0c9cda5d0fda58ff878f2894f4d4bcecf851c
2022-02-15 21:15:05 +00:00
Liz Kammer
4902daf52f Merge "Correct bp2build canonical_from_root logic" am: 5ee913f527
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1985613

Change-Id: I374352d470b8d0e351de3b47d5a48f87d4ac40ab
2022-02-15 20:57:04 +00:00
Liz Kammer
5ee913f527 Merge "Correct bp2build canonical_from_root logic" 2022-02-15 20:43:57 +00:00
Liz Kammer
7756c8f20e Correct bp2build canonical_from_root logic
The logic was inverted from what it should have been,
canonical_from_root --> no strip_import_prefix attribute.

Test: build/bazel/ci/bp2build.sh
Test: build/bazel/ci/mixed_droid.sh
Change-Id: Ic6685d8f0b88279d4444bab3b5e03a544d225f77
2022-02-15 09:54:57 -05:00
Treehugger Robot
162114aa9f Merge "Show failing products in multiproduct_kati" am: b3e5b18aa2 am: 7acf4fe128 am: 2f82ca8707
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1985373

Change-Id: I21fa6686763b0d8a3996707fee852e30f8c9adad
2022-02-15 03:24:08 +00:00
Treehugger Robot
2f82ca8707 Merge "Show failing products in multiproduct_kati" am: b3e5b18aa2 am: 7acf4fe128
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1985373

Change-Id: Id1e11857435c9e38d93fe09a88439144ee0f1e0b
2022-02-15 03:12:36 +00:00
Treehugger Robot
7acf4fe128 Merge "Show failing products in multiproduct_kati" am: b3e5b18aa2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1985373

Change-Id: I0708a8d683900d64858f4480d52157d1999a8c72
2022-02-15 02:50:51 +00:00
Treehugger Robot
b3e5b18aa2 Merge "Show failing products in multiproduct_kati" 2022-02-15 02:23:25 +00:00
Yi Kong
2f9bef3426 Merge "Don't reduce inline limit for afdo enabled projects" am: 1ca54b2cfd am: 10b71eb414 am: 9e56a9cb3e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1984569

Change-Id: I84c2225a8bd74f8c784db56f1df373c562f71e45
2022-02-14 21:18:57 +00:00
Yi Kong
9e56a9cb3e Merge "Don't reduce inline limit for afdo enabled projects" am: 1ca54b2cfd am: 10b71eb414
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1984569

Change-Id: I929646337c8f2ab94e6d2a8612fd8b9f3d5aa31d
2022-02-14 21:03:50 +00:00
Yi Kong
10b71eb414 Merge "Don't reduce inline limit for afdo enabled projects" am: 1ca54b2cfd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1984569

Change-Id: I3bd1821814d89267caddae48058230e62f71f25e
2022-02-14 20:50:02 +00:00
Liz Kammer
124967f597 Show failing products in multiproduct_kati
Test: cause products to fail and verify they appear in error message
Change-Id: I4111b919aebc0b8d80ecbd17be3c2745c75b76a5
2022-02-14 15:42:53 -05:00
Yi Kong
1ca54b2cfd Merge "Don't reduce inline limit for afdo enabled projects" 2022-02-14 20:33:40 +00:00
Xin Li
9329a96b69 [automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: 91c585812c -s ours am: 3781092299 -s ours
am skip reason: Merged-In I4fecfba711c0d3d7a22f4fdf7684924a9457b464 with SHA-1 a91ba25464 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16844241

Change-Id: Iaa369a485baf42018935d485b16ee0a71efad0d4
2022-02-14 18:20:56 +00:00
Xin Li
3781092299 [automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: 91c585812c -s ours
am skip reason: Merged-In I4fecfba711c0d3d7a22f4fdf7684924a9457b464 with SHA-1 a91ba25464 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16844241

Change-Id: Icc1ee415384b9abf935d150d5c5585a40617a562
2022-02-14 18:03:32 +00:00
Xin Li
91c585812c Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master 2022-02-14 17:30:12 +00:00
Jiakai Zhang
f0a85f8611 Merge "Revert "Remove the primary boot image from the ART APEX."" am: e51b2377f5 am: 1283b87457 am: ba249a585c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1984988

Change-Id: I2e9bae8c9322a700aa6b293a05c2eeff3d040cfe
2022-02-14 14:23:53 +00:00
Jiakai Zhang
ba249a585c Merge "Revert "Remove the primary boot image from the ART APEX."" am: e51b2377f5 am: 1283b87457
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1984988

Change-Id: I6b6f57149b16944e5aba2ba2ef5255c92c325b72
2022-02-14 14:07:10 +00:00
Jiakai Zhang
1283b87457 Merge "Revert "Remove the primary boot image from the ART APEX."" am: e51b2377f5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1984988

Change-Id: I4adefab5276393b1215a90239c513c932d7dbbc1
2022-02-14 13:49:04 +00:00
Jiakai Zhang
e51b2377f5 Merge "Revert "Remove the primary boot image from the ART APEX."" 2022-02-14 13:39:57 +00:00
Jiakai Zhang
fb14676ed4 Revert "Remove the primary boot image from the ART APEX."
Revert submission 1946769-boot-image-flip-b211973309

Reason for revert: Broke golem
Reverted Changes:
I80ffd9160:Remove the primary boot image from the ART APEX.
I45aaa5984:Remove the primary boot image from the ART APEX.

Change-Id: I9167a12cb158ede140dd44dc4458b0770c858379
2022-02-14 12:14:01 +00:00
Yi Kong
4ef5459f7d Don't reduce inline limit for afdo enabled projects
Test: presubmit
Change-Id: Id964165c7af50da9cd5e92c25ad2c4191eb2147a
2022-02-14 20:02:04 +08:00
Jiakai Zhang
ecc46828c9 Merge "Remove the primary boot image from the ART APEX." am: 135103e381 am: 19cc01abc2 am: 6d44add326
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1947128

Change-Id: Iaec78f236c1f3819690ab36efd5acb8a11bbccbb
2022-02-14 11:17:07 +00:00
Jiakai Zhang
6d44add326 Merge "Remove the primary boot image from the ART APEX." am: 135103e381 am: 19cc01abc2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1947128

Change-Id: Ic47e2f2e141447198c8fc0993f548db533e046a0
2022-02-14 10:42:01 +00:00
Jiakai Zhang
19cc01abc2 Merge "Remove the primary boot image from the ART APEX." am: 135103e381
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1947128

Change-Id: I4096c873f83b4a309ad89047d6075b57632f907b
2022-02-14 10:15:43 +00:00
Jiakai Zhang
135103e381 Merge "Remove the primary boot image from the ART APEX." 2022-02-14 09:59:16 +00:00
Chih-hung Hsieh
061c3b5234 Merge "Split the clangTidyRE rule" am: 1ead213e6d am: 44ec636d91 am: 00c541a9dc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1980668

Change-Id: Iaca7fffc976bd0c91e5d829ec183ed2a9b8a3863
2022-02-12 05:40:11 +00:00