Commit Graph

40284 Commits

Author SHA1 Message Date
Liz Kammer
fc8bc62d2a Merge "Handle product_variable asflag for cc_object." am: acacbc1166 am: 2cc845060d am: 263bdc570c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652787

Change-Id: I6f9fd6727fd3eb0a5fdf3b0ccd324fed24a05be6
2021-03-31 21:17:47 +00:00
Liz Kammer
9af11134ff Merge "Don't use custom mixed build logic for cc_object" am: 7dfaa3a732 am: 227e8e9493 am: 8ac144c6e6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1615643

Change-Id: Iff33eedc973c18eb99ee0de60548c8272b525104
2021-03-31 21:17:42 +00:00
Liz Kammer
263bdc570c Merge "Handle product_variable asflag for cc_object." am: acacbc1166 am: 2cc845060d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652787

Change-Id: Id44d10eed084732f693e00896d990b1ccf57d08a
2021-03-31 20:31:47 +00:00
Liz Kammer
8ac144c6e6 Merge "Don't use custom mixed build logic for cc_object" am: 7dfaa3a732 am: 227e8e9493
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1615643

Change-Id: I4e8d3c51e2cd11415529ba547fd8619f7637ed27
2021-03-31 20:31:43 +00:00
Liz Kammer
2cc845060d Merge "Handle product_variable asflag for cc_object." am: acacbc1166
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652787

Change-Id: If76000e28e7499243a87a5811852a62350dbe5a0
2021-03-31 19:51:48 +00:00
Liz Kammer
227e8e9493 Merge "Don't use custom mixed build logic for cc_object" am: 7dfaa3a732
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1615643

Change-Id: I517f16a5ce4b141fa26b50d7533ee0ba8ef6fa19
2021-03-31 19:51:30 +00:00
Liz Kammer
acacbc1166 Merge "Handle product_variable asflag for cc_object." 2021-03-31 18:43:55 +00:00
Liz Kammer
7dfaa3a732 Merge "Don't use custom mixed build logic for cc_object" 2021-03-31 18:43:55 +00:00
Paul Duffin
6595f7b47a Merge "Remove varargs from Fixture(t *testing.T)" am: 301099e451 am: cffb5bf2c4 am: dc6f50ba96
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660017

Change-Id: I9d9da20178e47b10ef573487d401c5e34ea6111a
2021-03-31 18:34:14 +00:00
Paul Duffin
450157f5d6 Merge "Remove varargs from RunTest(t *testing.T)" am: 5086512524 am: f199bedb2d am: c29b3dd043
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658078

Change-Id: Id84553d18b818cc8f3fba596a5c230551416d73e
2021-03-31 18:34:07 +00:00
Christopher Parsons
cac1ba6ec3 Merge "Register bp2build module types even outside generation" am: c68bc37e51 am: 776f9ef8cb am: 2365195fa0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1657219

Change-Id: I4c46426809b158251bc76dc52b9f96a06c63adfb
2021-03-31 18:34:00 +00:00
Treehugger Robot
a6f57558af Merge "Add license for bloaty subdirectory." am: 838449d993 am: c2afccd7a2 am: 9b757cd4fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655029

Change-Id: Iaaad9625d7e8da27cd3d95c10ec4263a5242c279
2021-03-31 18:32:50 +00:00
Paul Duffin
dc6f50ba96 Merge "Remove varargs from Fixture(t *testing.T)" am: 301099e451 am: cffb5bf2c4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660017

Change-Id: I6fd47a0e21b990b279b61225d94ff93ba58bfa08
2021-03-31 18:27:49 +00:00
Paul Duffin
c29b3dd043 Merge "Remove varargs from RunTest(t *testing.T)" am: 5086512524 am: f199bedb2d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658078

Change-Id: Ie5e8aae83feeb2e07bb5906de82536bd50171ce3
2021-03-31 18:27:29 +00:00
Paul Duffin
cffb5bf2c4 Merge "Remove varargs from Fixture(t *testing.T)" am: 301099e451
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660017

Change-Id: I907a9533e80eafb33c6f0389cac12c4fb3d9f006
2021-03-31 17:56:11 +00:00
Paul Duffin
f199bedb2d Merge "Remove varargs from RunTest(t *testing.T)" am: 5086512524
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658078

Change-Id: Ib8249d0e33acbc0f6da88d90e3758b810debedc0
2021-03-31 17:55:24 +00:00
Christopher Parsons
2365195fa0 Merge "Register bp2build module types even outside generation" am: c68bc37e51 am: 776f9ef8cb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1657219

Change-Id: Ib21052dc10472a31bb888b366bb9ccc11a3cf17d
2021-03-31 17:32:30 +00:00
Treehugger Robot
9b757cd4fe Merge "Add license for bloaty subdirectory." am: 838449d993 am: c2afccd7a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655029

Change-Id: I3a376bc1f15f6b82b4d2fc4144c7a870bc3d8985
2021-03-31 17:32:22 +00:00
Paul Duffin
301099e451 Merge "Remove varargs from Fixture(t *testing.T)" 2021-03-31 17:18:58 +00:00
Paul Duffin
5086512524 Merge "Remove varargs from RunTest(t *testing.T)" 2021-03-31 17:18:14 +00:00
Christopher Parsons
776f9ef8cb Merge "Register bp2build module types even outside generation" am: c68bc37e51
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1657219

Change-Id: I6804bd38c95e121746995a18a59f5473338ce2cf
2021-03-31 16:56:19 +00:00
Treehugger Robot
c2afccd7a2 Merge "Add license for bloaty subdirectory." am: 838449d993
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655029

Change-Id: I5ad9baf2e55554ecfecbd4e550f5200e1fb39c9b
2021-03-31 16:52:29 +00:00
Christopher Parsons
c68bc37e51 Merge "Register bp2build module types even outside generation" 2021-03-31 16:32:37 +00:00
Paul Duffin
2303174d95 Merge changes Ia3e93b8a,I964af3cb am: 4f6d15465b am: 18674bc4a8 am: 4d7fd01c00
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655215

Change-Id: Ic22d20d0e3618ccacea62beb01a91117f5a56bc8
2021-03-31 16:28:16 +00:00
Paul Duffin
4eca3c04fc Merge "Extract prepareForCcTest" am: d11d199ba6 am: 3b56761441 am: 0dcfdfd118
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655213

Change-Id: I7f0bc0e5600ff5dbe95319fa1c2f74c592398c66
2021-03-31 16:27:16 +00:00
Chris Parsons
b164b381b2 Register bp2build module types even outside generation
Without this fix, mixed builds are silently disabled, as a recent change
disabled mixed builds for all module types which are not listed in this
map. This map should be populated for both bp2build generation and for
mixed builds.

Test: lunch aosp_flame && USE_BAZEL_ANALYSIS=1 m libc
Change-Id: Ib2a3fb2de2e7a5204ef01355522ae569e0424dc7
2021-03-31 12:26:01 -04:00
Treehugger Robot
838449d993 Merge "Add license for bloaty subdirectory." 2021-03-31 16:14:51 +00:00
Paul Duffin
4d7fd01c00 Merge changes Ia3e93b8a,I964af3cb am: 4f6d15465b am: 18674bc4a8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655215

Change-Id: I8d99f538d751058addf9a6bb88fe2efcde01cfba
2021-03-31 15:44:56 +00:00
Paul Duffin
0dcfdfd118 Merge "Extract prepareForCcTest" am: d11d199ba6 am: 3b56761441
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655213

Change-Id: I81fb9ad224540c1078021d63580bd76ce96c11a5
2021-03-31 15:44:49 +00:00
Paul Duffin
18674bc4a8 Merge changes Ia3e93b8a,I964af3cb am: 4f6d15465b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655215

Change-Id: Ic544a97baed5a669a9528505b5a4110b8e738762
2021-03-31 15:15:17 +00:00
Paul Duffin
3b56761441 Merge "Extract prepareForCcTest" am: d11d199ba6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655213

Change-Id: I16a5fd04cedaa91b98b82c3450a39d80070a64a2
2021-03-31 15:15:01 +00:00
Paul Duffin
34a7fff9e0 Remove varargs from Fixture(t *testing.T)
Bug: 182885307
Test: m nothing
Change-Id: I71c3cf47ba1dc8d29d1533789c4c991cb825bd88
2021-03-31 16:04:07 +01:00
Paul Duffin
55e740e9a6 Remove varargs from RunTest(t *testing.T)
Use GroupFixturePreparers instead.

Bug: 182885307
Test: m nothing
Change-Id: Iaedb0ddc9d6a704f4d41363e705f3025a1291dc8
2021-03-31 16:03:59 +01:00
Paul Duffin
4f6d15465b Merge changes Ia3e93b8a,I964af3cb
* changes:
  Remove ccFixtureFactory
  Remove buildDir from cc package
2021-03-31 14:26:03 +00:00
Paul Duffin
d11d199ba6 Merge "Extract prepareForCcTest" 2021-03-31 14:25:19 +00:00
Paul Duffin
4b2ff1652c Merge "Rename OptionalPath.RelativeToPath -> RelativeToTop" am: 32eccae1ac am: 4ac8cd6582 am: d188fa7de2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658072

Change-Id: I1ad2710e2439861542f01a976b185bb4084b02dd
2021-03-31 10:45:46 +00:00
Paul Duffin
d188fa7de2 Merge "Rename OptionalPath.RelativeToPath -> RelativeToTop" am: 32eccae1ac am: 4ac8cd6582
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658072

Change-Id: I2a474c61084558bfdc2298d99b527d271c2573a8
2021-03-31 10:02:44 +00:00
Paul Duffin
4ac8cd6582 Merge "Rename OptionalPath.RelativeToPath -> RelativeToTop" am: 32eccae1ac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658072

Change-Id: I6b9fd21978838a5bae4926e51ef94ca4d81e1560
2021-03-31 09:24:51 +00:00
Paul Duffin
32eccae1ac Merge "Rename OptionalPath.RelativeToPath -> RelativeToTop" 2021-03-31 08:57:43 +00:00
Ryan Prichard
9de87e4487 Merge "Revert "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"" am: ae4246488f am: 1a454d987c am: ffec4fb0b4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658930

Change-Id: Ic19ef4205284bb64ead303bc004667ce22d725f5
2021-03-31 05:59:10 +00:00
Jose "Pepe" Galmes
99e56981b1 Merge "Fix missing snapshot headers." am: 9d54139763 am: db27fa0986 am: 9c3fe4daa8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658921

Change-Id: I13a5641d55b8df4225bf7154154e69eb47a2eed6
2021-03-31 05:58:57 +00:00
Ryan Prichard
ffec4fb0b4 Merge "Revert "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"" am: ae4246488f am: 1a454d987c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658930

Change-Id: Ica64c45eccfcc33d07a3863bb55f9fe02d0f3d9a
2021-03-31 05:53:09 +00:00
Jose "Pepe" Galmes
9c3fe4daa8 Merge "Fix missing snapshot headers." am: 9d54139763 am: db27fa0986
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658921

Change-Id: I11b58c0de669c2e203c4fab8aea92c68ee54b4f5
2021-03-31 05:52:42 +00:00
Ryan Prichard
1a454d987c Merge "Revert "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"" am: ae4246488f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658930

Change-Id: If041c23640c24b1b55ce360a8e8c2f38b1b598f7
2021-03-31 05:52:22 +00:00
Ryan Prichard
ae4246488f Merge "Revert "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"" 2021-03-31 05:29:51 +00:00
Jose "Pepe" Galmes
db27fa0986 Merge "Fix missing snapshot headers." am: 9d54139763
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658921

Change-Id: I3bb44e08056acef7021535bed77fa845c27a2d4e
2021-03-31 05:27:25 +00:00
Jose "Pepe" Galmes
9d54139763 Merge "Fix missing snapshot headers." 2021-03-31 04:45:43 +00:00
Ryan Prichard
74bdc28817 Revert "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"
This reverts commit 29b9de083e.

Reason for revert: b/184095989

Change-Id: I11d90562e0703631258a5e9f1b2dc36f1702289a
2021-03-31 03:25:57 +00:00
Colin Cross
ae012ff969 Merge "Default metalava sandboxing to true" am: 8b6378b0dc am: 0d6a3af0f7 am: 3fc612ce15
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1654170

Change-Id: I53720a775034e7b6cc6730e4faa14fedc5b9cfca
2021-03-31 01:20:28 +00:00
Colin Cross
3fc612ce15 Merge "Default metalava sandboxing to true" am: 8b6378b0dc am: 0d6a3af0f7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1654170

Change-Id: Ibcc9359a4d1d447df72694224717c4a5e7a337ae
2021-03-31 00:55:23 +00:00