Christopher Parsons
bc3f7e0276
Merge "Refactor and cleanup of cquery processing"
2021-03-16 21:12:01 +00:00
Liz Kammer
bdc609972c
Support autoconverted modules in mixed builds
...
modules converted with bp2build_available are will also be available to
be used in mixed builds.
Test: build/bazel/scripts/milestone-2/demo.sh full
Test: go tests
Change-Id: I49f16ec3ba5bb11dfed8066af069c27eb04371fb
2021-03-16 15:11:49 -04:00
Chris Parsons
944e7d01aa
Refactor and cleanup of cquery processing
...
Test: USE_BAZEL_ANALYSIS=1 m libc
Change-Id: Iaf9a92e84d39c132e2444a8aaafd79505a12b8ec
2021-03-16 14:39:16 -04:00
Liz Kammer
57355683d4
Temporarily disable cc_objects in mixed builds
...
Bug: 181794963
Test: generate bp2build targets and run mixed builds
Change-Id: If4562fe8ed7bde88141b40166eca9d01f6538106
2021-03-16 13:34:48 -04:00
Justin DeMartino
383bfb392f
Allow extending of the list of directories to be scanned for VSDK
...
Bug: 180925851
Bug: 181564692
Test: m nothing, manually
Change-Id: Ifff95db4c9ec362322fecca08f7fd1a7b60755c0
2021-03-15 23:14:47 +00:00
Justin Yun
13decfb0bb
Define __ANDROID_VENDOR__ and __ANDROID_PRODUCT__
...
__ANDROID_VNDK__ is defined for the modules that are able to use the
VNDK libraries. As both product and vendor variants define
__ANDROID_VNDK__, we don't know if a module is built for vendor or
product on build time.
__ANDROID_VENDOR__ and __ANDROID_PRODUCT__ macros can be used to
specify the image-variant-dependent codes.
Bug: 180646847
Test: m nothing
Change-Id: Id6c3e1e3d47deaf3684c0c02964718658cf2fec5
2021-03-15 17:28:59 +09:00
Paul Duffin
1b511a9f47
Migrate from result methods to function Asserts am: e84b1338c5
am: 37e8d92321
am: b364e7b212
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629626
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic7f8e38989f273939aea30427ba61bdf88043e99
2021-03-13 03:48:12 +00:00
Paul Duffin
e84b1338c5
Migrate from result methods to function Asserts
...
Bug: 181070625
Test: m nothing
Change-Id: Iadb85270290acb52c55f2ad70c9f145f1c34b611
2021-03-12 22:24:51 +00:00
Cindy Zhou
370fc523a8
Merge "Enable cfi for 32bit arch" am: 34d300ba76
am: 809e91cf12
am: 87075e20e7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1570600
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ide322a8fbcce16b1382cf0eacfc18ad4f5bba8f9
2021-03-12 13:47:22 +00:00
Cindy Zhou
34d300ba76
Merge "Enable cfi for 32bit arch"
2021-03-12 12:41:39 +00:00
Paul Duffin
24963ea1e3
Merge "Prevent mock filesystem files being overridden by accident" am: 412a209d87
am: a517bddd85
am: 53b805d276
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629639
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If124e77a419bc9d1b9416187263a88aefb28874c
2021-03-12 09:44:20 +00:00
Paul Duffin
412a209d87
Merge "Prevent mock filesystem files being overridden by accident"
2021-03-12 08:04:43 +00:00
Paul Duffin
f2d55024bb
Merge "Convert cc/prebuilt_test.go to use fixtures" am: f11bced30b
am: e70de62af3
am: 8c0ee2d8ce
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626515
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib741c9ce6a2b10021960fa25dee42ae24d0069cb
2021-03-12 00:09:21 +00:00
Paul Duffin
efa480f650
Merge changes I6b408d44,I7e57c978 am: d7bbeffe0e
am: 7ac41ea830
am: e447d4d0ee
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626514
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibee3298948c2c842788442c53ba7125ecd61c54f
2021-03-12 00:09:15 +00:00
Paul Duffin
f11bced30b
Merge "Convert cc/prebuilt_test.go to use fixtures"
2021-03-11 21:58:39 +00:00
Paul Duffin
d7bbeffe0e
Merge changes I6b408d44,I7e57c978
...
* changes:
Add preparer for test to use AndroidMk
Convert cc/cc_test.go tests that use CreateTestContext to fixtures
2021-03-11 21:58:14 +00:00
Paul Duffin
6e9a4007b5
Prevent mock filesystem files being overridden by accident
...
Bug: 181070625
Test: m nothing
Change-Id: Ib12b5cbe9af980706620d7d7d85bcfe31f36b07f
2021-03-11 19:21:12 +00:00
Christopher Parsons
3a642e2800
Merge "mixed builds for cc_static_library without deps" am: 2bed9ffaf4
am: a86985e40a
am: 3cb7e6bd83
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625068
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iddbc0f04dec0faeb70f5ccfe694dd3deaa65cb61
2021-03-11 15:46:38 +00:00
Paul Duffin
73bfe21a62
Merge "Convert fuchsia tests to use test fixtures" am: 4e1916011c
am: 3dbfef078e
am: 9225cc2bf9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626509
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic1b047130460625a91c636c8e2aa516bcbbf35f3
2021-03-11 15:45:03 +00:00
Christopher Parsons
2bed9ffaf4
Merge "mixed builds for cc_static_library without deps"
2021-03-11 15:11:44 +00:00
Paul Duffin
6a1160e749
Convert cc/prebuilt_test.go to use fixtures
...
Bug: 181070625
Test: m nothing
Change-Id: I6048812962382e2adaf79d941a24e5c0ffdd9b25
2021-03-11 15:04:43 +00:00
Paul Duffin
7d8a8ad0d1
Convert cc/cc_test.go tests that use CreateTestContext to fixtures
...
Bug: 181070625
Test: m nothing
Change-Id: I7e57c978fa07ee8c0f35d567753751bd7b128b1e
2021-03-11 15:04:39 +00:00
Paul Duffin
4e1916011c
Merge "Convert fuchsia tests to use test fixtures"
2021-03-11 14:07:01 +00:00
Lukacs T. Berki
778c31d32f
Hard-wire the path to xcrun as /usr/bin/xcrun. am: 21d5c7aaa9
am: 8f23c72f9e
am: 177e95d4d6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626516
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I980be00ea77f4423ff04f4c44b03391aef94d735
2021-03-11 12:38:50 +00:00
Lukacs T. Berki
21d5c7aaa9
Hard-wire the path to xcrun as /usr/bin/xcrun.
...
This lets us not leak $PATH to soong_build. It was only needed for
Darwin tests anyway.
Test: Will ask jingwen@ who has a Mac.
Change-Id: I4647e41275b323fe6283580f8f92718c6229f23e
2021-03-11 08:52:39 +01:00
Paul Duffin
ecdac8a6d6
Convert fuchsia tests to use test fixtures
...
Bug: 181070625
Test: m nothing
Change-Id: Ic2b86f7c603ff1c4b48884cb58908db536d98f37
2021-03-11 07:26:11 +00:00
Treehugger Robot
3ccb6af0e7
Merge "AIDEGen: Add "-fprofile-sample-use" parameter into category." am: b3d6edd6c0
am: d32045e2f3
am: 0a74edc095
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620690
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I390e6a4e1024d7343b4baa527f10b258b6f7e2a8
2021-03-11 06:30:59 +00:00
Treehugger Robot
b3d6edd6c0
Merge "AIDEGen: Add "-fprofile-sample-use" parameter into category."
2021-03-11 04:34:02 +00:00
Cindy Zhou
e0c14678d4
Enable cfi for 32bit arch
...
Enabling cfi for 32-bit arch; b/35157333 seems to have been resolved in b/67507331.
Bug: 158010610
Test: manual interaction with Wimbley device: youtube video, chrome
navigations, gmail
MPTS testing on Sargo
Change-Id: I9eb034deed9938710f0f7b690fa57108d9bc5669
Change-Id: I434748ede352f998e64a6639de6ba162762ee7f0
2021-03-10 17:14:02 -08:00
Paul Duffin
0416343c5b
Merge changes Ib2c6ac28,I7c76ed6d,I00415f10,I4be2a16c,I6f269c9c, ... am: 67e848ab04
am: 07d76a4ec2
am: 020cd977dc
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625385
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9535f62f41e12d1c09c0173d6ece58abede67945
2021-03-10 23:57:35 +00:00
Chris Parsons
808d84c45d
mixed builds for cc_static_library without deps
...
Test: Manual mixed builds testing of `libc` target with manually
migrated "libc_nopthread" and "libc_init_dynamic".
Change-Id: If7d67e95eca9899271b1eeb662c7c2e571f64afa
2021-03-10 13:24:59 -05:00
Paul Duffin
02a3d65402
Support test fixtures in cc package
...
Restructures the cc package test setup code to create FixturePreparer
instances for setting up a test fixture and converts some tests to
use it.
The goal with this change is not to switch all the cc tests over to
directly using the new model but instead to ensure that the majority of
the cc tests run with the new model, to allow existing tests to easily
switch to the new model when needed and to allow dependent packages to
be switched to the new model.
Bug: 181070625
Test: m nothing
Change-Id: I00415f10fb44c1b9e78e1317e7f50bb61984d3a4
2021-03-09 23:06:00 +00:00
bralee
c117f6fc00
AIDEGen: Add "-fprofile-sample-use" parameter into category.
...
"-fprofile-sample-use" parameter needs to be added to
categorizeParameter function.
Bug: 181817731
Test: 1. aidegen -a -i c art build bootable frameworks/base/core libnativehelper external/protobuf external/gflags external/googletest hardware/interfaces/health packages/modules/Gki system/apex system/core/fastboot system/core/fs_mgr system/core/healthd system/core/init system/core/libbinderwrapper system/core/libcutils system/core/liblog system/core/libprocessgroup system/core/libutils system/core/property_service system/core/rootdir system/core/storaged system/extras system/gsid system/hwservicemanager system/libbase system/libhidl system/libhwbinder system/libvintf system/sepolicy system/update_engine test tools
2. CLion launched without errors in 'CMake' tag.
Change-Id: I4e9b0fd19fe00d23a9aa535b1ab7ade9c4a46f69
2021-03-08 09:33:23 +08:00
Paul Duffin
381bd33c04
Merge "Fix build break caused by registering genrules twice" am: 6d3e726887
am: bbb10d2452
am: 6ce4598e3c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621418
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8970e441a817db83cbf64623954e51c814cf4ada
2021-03-06 11:53:35 +00:00
Paul Duffin
cdcd2be1ff
Fix build break caused by registering genrules twice
...
Two separate changes that passed presubmits separately and did not
conflict when merged together unfortunately clashed at runtime. The
changes are:
* Ic00c7e480dc738d7a88d038aca6ab95a1502a24a
* Ic98fdc29a63155174a3227e7e918b26f0a8763bb
Test: m nothing
Change-Id: I7b5704c22cc2ea2095f5fb92c59f0526bb445f13
2021-03-06 10:03:22 +00:00
Paul Duffin
8d74783b41
Merge "Clean up cc.RegisterRequiredBuildComponentsForTest()" am: 0805d4ebdd
am: b6ae322278
am: 1f50ff0df6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621414
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I22877e0de75fbb1f4899fad3081418acf3b6df74
2021-03-06 09:56:58 +00:00
Paul Duffin
1c58ce4a52
Merge "Fix mutator ordering issue in apex tests" am: 97c8128eea
am: d8033e1d26
am: e672daac6b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621415
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifa3b28737bcf55fb5ccda37e3e4dec4973cf8e34
2021-03-06 09:56:43 +00:00
Paul Duffin
0805d4ebdd
Merge "Clean up cc.RegisterRequiredBuildComponentsForTest()"
2021-03-06 08:43:56 +00:00
Paul Duffin
6d119b804c
Fix mutator ordering issue in apex tests
...
Previously, the override mutators were being run before the prebuilt
mutators that did not match the runtime behavior. This change fixes
that ordering.
In the process it broke TestApexWithAppImportsPrefer. That test tries
to verify that an apex that depends on an android_app will use an
android_app_import if that is preferred. Unfortunately, it only worked
because of the incorrect order of the mutators.
The test worked before this change because the prebuilt mutators were
being run after the overridableModuleDepsMutator. That meant that any
dependencies added by that mutator onto source modules could be
replaced by the PrebuiltPostDepsMutator with the preferred prebuilt
module.
Switching the order to match the runtime meant that the prebuilt
mutators were run before the overrides so never had a chance to replace
the dependencies added by the overrides.
Bug: 181953909
Bug: 181974714
Test: m nothing
Change-Id: Ic98fdc29a63155174a3227e7e918b26f0a8763bb
2021-03-05 18:38:58 +00:00
Paul Duffin
d6ceb8600c
Clean up cc.RegisterRequiredBuildComponentsForTest()
...
Changes this function so it only registers components from the cc
package by pushing the call to genrule.RegisterGenruleBuildComponents()
down into those packages whose tests need it.
This will make it easier to migrate cc package tests to test fixtures
as the RegisterRequiredBuildComponentsForTest() no longer overlaps with
preparers from the genrule packages.
Bug: 181070625
Test: m nothing
Change-Id: Ic00c7e480dc738d7a88d038aca6ab95a1502a24a
2021-03-05 18:20:33 +00:00
Treehugger Robot
5921172be1
Merge "Remove Abseil checks from clang-tidy defaults." am: 636d152e08
am: 93a58aaf37
am: d39700c648
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1612584
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idedbaae3e0b5b4777503107de5950b17784239a2
2021-03-03 00:23:58 +00:00
Christopher Parsons
3bc0783320
Merge "Support cc_object modules in mixed builds" am: bc39e17a1d
am: 218cf3dec6
am: cd4dcdda18
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1599675
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2609ec4b223d49d5312bb44ae05b01eefe38a023
2021-03-03 00:23:46 +00:00
Paul Duffin
0b0921a808
Merge "Remove deapexer and prebuilt apex select mutators" am: 4b786d2da1
am: 0630dacc0c
am: 9d697b3d94
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1610795
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4670d011f304c943cc6156312b0154e9236ca08f
2021-03-03 00:23:03 +00:00
Treehugger Robot
636d152e08
Merge "Remove Abseil checks from clang-tidy defaults."
2021-03-02 20:22:14 +00:00
Christopher Parsons
bc39e17a1d
Merge "Support cc_object modules in mixed builds"
2021-03-02 16:44:56 +00:00
Paul Duffin
4b786d2da1
Merge "Remove deapexer and prebuilt apex select mutators"
2021-03-02 10:48:29 +00:00
Treehugger Robot
b8b4d74d37
Merge "APEX uses the latest version of the stub" am: ce80f18749
am: 3310e2d9ea
am: 803eece603
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1609533
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic9355035dd83782c478a12fb16a5896c50968a58
2021-03-02 03:10:43 +00:00
Treehugger Robot
ce80f18749
Merge "APEX uses the latest version of the stub"
2021-03-02 01:02:18 +00:00
Chris Parsons
8d6e433c1e
Support cc_object modules in mixed builds
...
Test: With a handwritten conversion of crtbegin_so1, USE_BAZEL_ANALYSIS=1 m crtbegin_so1
Change-Id: I7c777d7f46b37aa1827cc04205e2014f9293bf35
2021-03-01 18:22:34 -05:00
Krzysztof Kosiński
a3014f1c13
Remove Abseil checks from clang-tidy defaults.
...
Abseil is not available in Android, so these checks are not
actionable.
Test: Compiled frameworks/av, no more spurious warnings.
Change-Id: Ic573a3234a99b0fa1f63449e8d020a17a43a134c
2021-03-01 13:25:03 -08:00