Commit Graph

34818 Commits

Author SHA1 Message Date
Ulyana Trafimovich
e430ac338a Merge "Move part of logic from construct_context.py to Soong." 2020-10-29 13:53:17 +00:00
Ulyana Trafimovich
3a81ccd8f9 Merge "Add separate dependency tags for compat libs based on SDK version." am: 05b9a65f25 am: 9d5814ff7c am: 7b898a1960 am: ad16c12eba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1453037

Change-Id: I92ac79581ad5cd29b9e05398d4e9b8ea7345fa2d
2020-10-29 12:04:16 +00:00
Ulyana Trafimovich
9ba949ae48 Merge "Fix handling of "android.test.mock" in class loader context." am: 17da06cfd9 am: 94b74f9559 am: deea2844fd am: a9381bec3f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1467832

Change-Id: I6f245711fd003a5f2c3f036241053c781c26c1fd
2020-10-29 12:04:06 +00:00
Ulyana Trafimovich
ad16c12eba Merge "Add separate dependency tags for compat libs based on SDK version." am: 05b9a65f25 am: 9d5814ff7c am: 7b898a1960
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1453037

Change-Id: I20ce4c3dbb9f93cbfa06f9115a5479129b777ae6
2020-10-29 11:45:42 +00:00
Ulyana Trafimovich
a9381bec3f Merge "Fix handling of "android.test.mock" in class loader context." am: 17da06cfd9 am: 94b74f9559 am: deea2844fd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1467832

Change-Id: Ic7dc1a9bfc02a7407957b3b62beff7f196092d46
2020-10-29 11:45:27 +00:00
Ulyana Trafimovich
7b898a1960 Merge "Add separate dependency tags for compat libs based on SDK version." am: 05b9a65f25 am: 9d5814ff7c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1453037

Change-Id: I885e3153200cdbfa10fe397c8f632ced68631daf
2020-10-29 11:18:07 +00:00
Ulyana Trafimovich
deea2844fd Merge "Fix handling of "android.test.mock" in class loader context." am: 17da06cfd9 am: 94b74f9559
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1467832

Change-Id: I97846bd84c82943c7df2c0a74eca2431013fd16b
2020-10-29 11:17:44 +00:00
Ulyana Trafimovich
9d5814ff7c Merge "Add separate dependency tags for compat libs based on SDK version." am: 05b9a65f25
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1453037

Change-Id: If834faff4cf0efc939e00ed46a8afc723963c41f
2020-10-29 10:48:24 +00:00
Ulyana Trafimovich
94b74f9559 Merge "Fix handling of "android.test.mock" in class loader context." am: 17da06cfd9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1467832

Change-Id: Ib61fd72a9f2b0c2b06ea3054a10d0b2d025dc4db
2020-10-29 10:47:48 +00:00
Ulyana Trafimovich
05b9a65f25 Merge "Add separate dependency tags for compat libs based on SDK version." 2020-10-29 10:27:59 +00:00
Ulyana Trafimovich
17da06cfd9 Merge "Fix handling of "android.test.mock" in class loader context." 2020-10-29 10:27:33 +00:00
Chris Parsons
6e524e761c Batch cquery requests for mixed builds am: b0f8ac4ff0 am: da4bb85447 am: 2e1a40491f am: 2d4b111996
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1471974

Change-Id: Ic8717bc6b2ef975f07d8cea87b6256d9e9b121e3
2020-10-29 02:11:28 +00:00
Chris Parsons
2d4b111996 Batch cquery requests for mixed builds am: b0f8ac4ff0 am: da4bb85447 am: 2e1a40491f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1471974

Change-Id: I041ed67cfc64d9288b5e2610f944bcee82883153
2020-10-29 01:55:25 +00:00
Chris Parsons
2e1a40491f Batch cquery requests for mixed builds am: b0f8ac4ff0 am: da4bb85447
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1471974

Change-Id: I75ec75d4f5e0f2b3b25de619ad197579b285020d
2020-10-29 01:40:57 +00:00
Yifan Hong
6b5bbb2f9f Merge "Add target.vendor_ramdisk." am: a03f8fe6da am: ddc1b65c95 am: 13c7373a59 am: 43a9d43d23
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1477643

Change-Id: Ia721b030374cdf269d99ef17f44cc1cac1e02274
2020-10-29 01:40:52 +00:00
Christopher Parsons
06d9fcc4ee Merge "Change mixed soong/bazel builds to use USE_BAZEL_ANALYSIS" am: 752212243f am: 98a603c97f am: ae1b7bda00 am: 35e6191fb8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1477445

Change-Id: Ia24125622f4de740a2ee7687ba16ec27a0ddfc4b
2020-10-29 01:40:15 +00:00
Chris Parsons
da4bb85447 Batch cquery requests for mixed builds am: b0f8ac4ff0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1471974

Change-Id: Ia8434f1f2621f8e1b43ee6da2ccc2578a6b2baf1
2020-10-29 01:22:51 +00:00
Yifan Hong
43a9d43d23 Merge "Add target.vendor_ramdisk." am: a03f8fe6da am: ddc1b65c95 am: 13c7373a59
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1477643

Change-Id: I7e459f65418c575de5f273b48191e93611b28c89
2020-10-29 01:21:48 +00:00
Christopher Parsons
35e6191fb8 Merge "Change mixed soong/bazel builds to use USE_BAZEL_ANALYSIS" am: 752212243f am: 98a603c97f am: ae1b7bda00
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1477445

Change-Id: If01e16da295eda906c7a7c47566296ae1309c5ca
2020-10-29 01:20:41 +00:00
Martin Stjernholm
59e0c7a98f Disable sanitizer flags and output files for sanitizer-enabled SDK members.
Test: build/soong/soong_ui.bash --make-mode \
      TARGET_PRODUCT=aosp_blueline_hwasan \
      TARGET_BUILD_VARIANT=userdebug nothing
Test: build/soong/scripts/build-aml-prebuilts.sh \
      runtime-module-{sdk,host-exports} \
      platform-mainline-{sdk,test-exports}
  Check that generated Android.bp files don't differ
Bug: 171754462
Change-Id: Ieef40ff202ceda2d9e613a5d9295f5c9d8160626
2020-10-29 00:26:24 +00:00
Nikita Ioffe
8d6ba89094 Update apex/allowed_deps.txt
Bug: 171330443
Bug: 171668006
Test: build/soong/scripts/update-apex-allowed-deps.sh
Change-Id: Id239ea9b31ce23f045f0db4027db33658ef3da14
2020-10-28 23:35:46 +00:00
Yifan Hong
13c7373a59 Merge "Add target.vendor_ramdisk." am: a03f8fe6da am: ddc1b65c95
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1477643

Change-Id: Ib48328dd3ac45c6c51dfef62eda6c73487c37058
2020-10-28 23:04:33 +00:00
Christopher Parsons
ae1b7bda00 Merge "Change mixed soong/bazel builds to use USE_BAZEL_ANALYSIS" am: 752212243f am: 98a603c97f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1477445

Change-Id: I616e55a93d1c02436596a8c2460f6dad460da8c7
2020-10-28 23:03:59 +00:00
Chris Parsons
b0f8ac4ff0 Batch cquery requests for mixed builds
This adds an extra step to mixed builds: creating a master BUILD/bzl
file pair to facilitate running a single cquery command to analyze
all soong->bazel edges in a single request.

Test: Mixed build tested with aosp/1441774, verified ninja outputs
depend on `bazel-out/` intermediates
Test: Manually verified contents of master BUILD and bzl files

Change-Id: I04803bcc91ac4182578f505b3f42893061ddd167
2020-10-28 21:56:14 +00:00
Yifan Hong
ddc1b65c95 Merge "Add target.vendor_ramdisk." am: a03f8fe6da
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1477643

Change-Id: Ib07cb32ae59b350246c4b840fe7c334cd3aef8b3
2020-10-28 21:21:01 +00:00
Christopher Parsons
98a603c97f Merge "Change mixed soong/bazel builds to use USE_BAZEL_ANALYSIS" am: 752212243f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1477445

Change-Id: Ib0ae66309f00c4fed72ccd58c0623bfb246b3a81
2020-10-28 21:07:43 +00:00
Yifan Hong
a03f8fe6da Merge "Add target.vendor_ramdisk." 2020-10-28 20:02:24 +00:00
Christopher Parsons
752212243f Merge "Change mixed soong/bazel builds to use USE_BAZEL_ANALYSIS" 2020-10-28 20:01:17 +00:00
Yifan Hong
85dbbbfa7b Merge "cc/linker.go: fix typo." am: 8683648981 am: 25861a9867 am: f7277d4af7 am: 5706e14f07
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1477642

Change-Id: I25189f2b0c0f4e766a3b1dbca29e269a122c2868
2020-10-28 18:48:41 +00:00
Yifan Hong
5706e14f07 Merge "cc/linker.go: fix typo." am: 8683648981 am: 25861a9867 am: f7277d4af7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1477642

Change-Id: Ie2c955d587214ab612fc951a9c6117637756efee
2020-10-28 18:34:56 +00:00
Ulyana Trafimovich
175d8d6cd2 Merge "Unify handling of compat and normal libs in class loader contexts." am: c5b6f32751 am: 228f63b4c1 am: 4dc62516cb am: 182b45c981
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1450817

Change-Id: Idd32fb1f1cfdff57a152492794fddbb642629190
2020-10-28 18:18:25 +00:00
Yifan Hong
f7277d4af7 Merge "cc/linker.go: fix typo." am: 8683648981 am: 25861a9867
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1477642

Change-Id: I841dcfe726cb5b06fa4117ea6d0abe7412f984c6
2020-10-28 18:11:07 +00:00
Ulyana Trafimovich
182b45c981 Merge "Unify handling of compat and normal libs in class loader contexts." am: c5b6f32751 am: 228f63b4c1 am: 4dc62516cb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1450817

Change-Id: Ide413d6d2f7659c88b999d3ebcf229a765efb367
2020-10-28 17:45:24 +00:00
Yifan Hong
25861a9867 Merge "cc/linker.go: fix typo." am: 8683648981
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1477642

Change-Id: I52994e1d2f61bf4b2c1570fdc38f98129397cc08
2020-10-28 17:39:31 +00:00
Ulyana Trafimovich
4dc62516cb Merge "Unify handling of compat and normal libs in class loader contexts." am: c5b6f32751 am: 228f63b4c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1450817

Change-Id: I4918a06bbff6ce11e43e202257c14ff3355c04cb
2020-10-28 17:33:13 +00:00
Yifan Hong
8683648981 Merge "cc/linker.go: fix typo." 2020-10-28 17:29:05 +00:00
Ulyana Trafimovich
228f63b4c1 Merge "Unify handling of compat and normal libs in class loader contexts." am: c5b6f32751
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1450817

Change-Id: I42d75e04c1f70a0d52ee802cb021a25e66eaae59
2020-10-28 17:19:19 +00:00
Ulyana Trafimovich
c5b6f32751 Merge "Unify handling of compat and normal libs in class loader contexts." 2020-10-28 17:05:05 +00:00
Nikita Ioffe
56f101389a [automerger skipped] Merge "Update apex/allowed_deps.txt" am: 7a19ee30ba am: 8c523ce0d7 am: e70d90a719 am: 70d6228006 -s ours
am skip reason: Change-Id Ic7ddd86cefc0c6a26de294b6e73b3e23d4791f5c with SHA-1 ec62601d24 is in history

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

Change-Id: I14d095d85957079393314cee6e103b48b70641d7
2020-10-28 14:08:39 +00:00
Nikita Ioffe
70d6228006 Merge "Update apex/allowed_deps.txt" am: 7a19ee30ba am: 8c523ce0d7 am: e70d90a719
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1471777

Change-Id: I4688397cfe7923773a9197bf64e9e818b34f4926
2020-10-28 13:47:41 +00:00
Nikita Ioffe
e70d90a719 Merge "Update apex/allowed_deps.txt" am: 7a19ee30ba am: 8c523ce0d7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1471777

Change-Id: I6e0810b718a1a3efad03ef7be46743829571bfc1
2020-10-28 13:32:47 +00:00
Nikita Ioffe
8c523ce0d7 Merge "Update apex/allowed_deps.txt" am: 7a19ee30ba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1471777

Change-Id: Icd9a7f640567555068f389e51c1d15d096c38d05
2020-10-28 13:17:13 +00:00
Nikita Ioffe
7a19ee30ba Merge "Update apex/allowed_deps.txt" 2020-10-28 12:57:25 +00:00
Paul Duffin
3527eadd0c Merge "Retry: Make ConfiguredJarList immutable" am: c097474f21 am: 101339a133 am: 104a934353 am: 1e6f10bf33
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1476916

Change-Id: I52505ceea5d1284ac3fdfc9f7d3e47a8d85cf972
2020-10-28 11:29:34 +00:00
Paul Duffin
1e6f10bf33 Merge "Retry: Make ConfiguredJarList immutable" am: c097474f21 am: 101339a133 am: 104a934353
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1476916

Change-Id: If30351c5202e3803caa28102d7a97d629de91442
2020-10-28 11:16:17 +00:00
Paul Duffin
104a934353 Merge "Retry: Make ConfiguredJarList immutable" am: c097474f21 am: 101339a133
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1476916

Change-Id: I9efe7f25944a8e220c065b8d03d667444bc8e284
2020-10-28 10:53:44 +00:00
Paul Duffin
101339a133 Merge "Retry: Make ConfiguredJarList immutable" am: c097474f21
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1476916

Change-Id: Ie33dbffe4501f46b780138cb9c56e997a468c137
2020-10-28 10:40:10 +00:00
Paul Duffin
c097474f21 Merge "Retry: Make ConfiguredJarList immutable" 2020-10-28 10:12:16 +00:00
Treehugger Robot
e5877cf200 Merge "Add smoke test for Bazel." am: 9d181ec5d5 am: 096747407a am: d92c9bbf46 am: 4aef9940a1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1475777

Change-Id: Ie73b38a54a6c3f673dfe695429dd3d02baa6ec8a
2020-10-28 07:43:06 +00:00
Treehugger Robot
4aef9940a1 Merge "Add smoke test for Bazel." am: 9d181ec5d5 am: 096747407a am: d92c9bbf46
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1475777

Change-Id: I4e234f3151e912b1a0c17078c1dc13c1de98e9db
2020-10-28 07:17:40 +00:00