Commit Graph

2576 Commits

Author SHA1 Message Date
Paul Duffin
a13f1c8dc0 Convert TestCompatConfig test to use test fixtures am: a369c7b50d am: 28cae4ca6f am: 6fb02328eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626505

Change-Id: I852b9b300a6e98c765e3c968023399b1152faa20
2021-03-16 09:51:45 +00:00
Paul Duffin
f75ab18b5b Add new compat_configs property to the apex am: 3abc174cfd am: d4716ce5a6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1638279

Change-Id: I3822016f85c030f27820538ba133ec007861417c
2021-03-16 08:05:09 +00:00
Paul Duffin
6fb02328eb Convert TestCompatConfig test to use test fixtures am: a369c7b50d am: 28cae4ca6f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626505

Change-Id: Ief32c21320ead2b92f47b3e485e2c3736290903f
2021-03-16 08:05:05 +00:00
Paul Duffin
4defbf4d39 Switch platform_compat_config to use common arch
Bug: 182816033
Test: m nothing
Change-Id: If8886edd9278d67fe2b6288a6bd8b152f2314401
2021-03-15 23:19:39 +00:00
Paul Duffin
1bc21dc7e6 Disallow platform_compat_config modules in apex prebuilts property
Bug: 182816033
Test: m nothing
Change-Id: I50dcc358e8ae143e21b1fbf1a12835bf1342606f
2021-03-15 23:19:39 +00:00
Paul Duffin
3abc174cfd Add new compat_configs property to the apex
Bug: 182816033
Test: m nothing
Change-Id: I485d7b178c0ed17e336a6ac2a13e8313426f374b
2021-03-15 23:19:36 +00:00
Paul Duffin
a369c7b50d Convert TestCompatConfig test to use test fixtures
As this test is the only test in the apex package to use the
platform_compat_config module type it does not make sense to include
that in all the tests so instead this converts the test to use fixtures
so it can easily customize it with the additional module type.

Bug: 181070625
Test: m nothing
Change-Id: I56fda772ee336db6cfb677143aa28b1a18911bff
2021-03-15 19:56:38 +00:00
satayev
b5c1a74f5d Merge "Don't track modules that are only available to APEXes." am: 2338d6f6e4 am: ebfe02a781 am: 13c655bf29
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628693

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8794765359558cfee7c9d1cb2ef74674a244f283
2021-03-15 14:11:23 +00:00
satayev
13c655bf29 Merge "Don't track modules that are only available to APEXes." am: 2338d6f6e4 am: ebfe02a781
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628693

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I468324eaa0ed012feba41cbf99809c8bd6ea397c
2021-03-15 13:28:54 +00:00
Paul Duffin
8a63b042d5 Merge "Convert ...InstallHwasan.. tests to use fixtures" am: ef0449b0f3 am: feed9a6153 am: 972e1eafe0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626503

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d49be067f9984b1497dde48d39a4b25d9dda6a3
2021-03-15 12:55:23 +00:00
satayev
2338d6f6e4 Merge "Don't track modules that are only available to APEXes." 2021-03-15 12:47:00 +00:00
Paul Duffin
972e1eafe0 Merge "Convert ...InstallHwasan.. tests to use fixtures" am: ef0449b0f3 am: feed9a6153
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626503

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I198ca31959a9f549af19344c136b30d6efd4cbe8
2021-03-15 12:12:47 +00:00
Paul Duffin
ef0449b0f3 Merge "Convert ...InstallHwasan.. tests to use fixtures" 2021-03-15 11:09:22 +00:00
Nicolas Geoffray
d45fa2d8ba Merge "Treat core_platform as stable unless module uses legacy" am: fb856f6add am: b684567a46 am: 5a8f6c5c96
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1619411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a43ed15e67d55c3e05d09698ca73520ef185745
2021-03-15 10:38:11 +00:00
Nicolas Geoffray
5a8f6c5c96 Merge "Treat core_platform as stable unless module uses legacy" am: fb856f6add am: b684567a46
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1619411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I501e1099d77697b34c70f13b064840b94424d52d
2021-03-15 09:57:43 +00:00
Nicolas Geoffray
fb856f6add Merge "Treat core_platform as stable unless module uses legacy" 2021-03-15 08:42:43 +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
a02cae345b Convert ...InstallHwasan.. tests to use fixtures
These tests rely on changing the definition of the "libc" module which
is a default module provided by the cc.GatherRequiredDepsForTest()
function. That function is called from within testApexContext() and so
added by default.

Previously, the tests relied on a number of factors to work:
1. All the default cc modules were added to the bp contents that were
   passed to testApexContext().
2. testApexContext() passed the augmented bp contents to
   TestArchConfig().
3. TestArchConfig() only stored the supplied bp contents in the root
   Android.bp file if it did not exist.

So, in order to override the default modules it simply made sure to add
its own Android.bp file into the file system first.

Unfortunately, that does not work with the test fixtures as the default
modules are defined in their own specific paths to avoid conflicting
with each other. To achieve the same effect as previously, i.e. no
default modules, this test uses an emptyFixtureFactory and only adds
preparers for cc and apex build components and ignores the default
module definitions altogether.

Bug: 181070625
Test: m nothing
Change-Id: Ic6b961dd2bd78c32cb326b2c7905426ee971c2d8
2021-03-12 18:26:41 +00:00
TreeHugger Robot
84c192f566 Merge "Allow ExtServices to use tflite_support" into mainline-prod am: 9c2890cac3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13806986

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17909dd25cecc0cd284becc274311feabe7cfac3
2021-03-12 17:19:25 +00:00
TreeHugger Robot
9c2890cac3 Merge "Allow ExtServices to use tflite_support" into mainline-prod 2021-03-12 16:43:07 +00:00
Lev Proleev
a2f2edcb68 Merge "Add libruy_static to allowed_deps" am: f6b5f8217c am: 894c8eb61b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1610793

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb0b3dd46d8e5aec6d5c1aadd1943a8b3f7a1fcd
2021-03-12 15:14:56 +00:00
Lev Proleev
f6b5f8217c Merge "Add libruy_static to allowed_deps" 2021-03-12 14:00:45 +00:00
Paul Duffin
d03f6a868f Merge changes Ifc96992e,Ic76523ba am: c10ee77ea6 am: b1ef3e2ce9 am: b587704556
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628691

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I15bfdaef65a848ec6ed0210c883195409ce85814
2021-03-12 09:44:13 +00:00
Paul Duffin
b587704556 Merge changes Ifc96992e,Ic76523ba am: c10ee77ea6 am: b1ef3e2ce9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628691

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f98cabe5a6ddae90458f7dc8a8b1725095493f4
2021-03-12 09:02:39 +00:00
Sophie Zheng
663778c712 Merge "Fix getting list of module libraries in builder.go" into mainline-prod 2021-03-11 23:38:08 +00:00
Artur Satayev
533b98cde3 Don't track modules that are only available to APEXes.
Modules that are not available for platform are developed with
updatability in mind, and do not require manual approvals.

Bug: 181223240
Test: checkbuild
Change-Id: I10b91053b3ef5a9ff5400d9d7a68fae3144a671c
2021-03-11 18:13:18 +00:00
Paul Duffin
37aad60507 Add apexFixtureFactory to apex package
Unlike the similar changes in other packages this change separates the
addition of the fixture factory and the conversion of the test...
methods to use them as there are a few tests that need converting to
use test fixtures first.

Bug: 181070625
Test: m nothing
Change-Id: Ic76523ba89fc1967631aeb682935935b5af116df
2021-03-11 17:25:29 +00:00
Artur Satayev
ff36f17b40 Introduce derive_classpath service.
go/updatable-classpath

Bug: 180105615
Test: manual + boot test
Change-Id: I713b3b881e2214f2994e1830580ae1122d7c5c3d
2021-03-11 11:46:28 +00:00
Chen Xu
42be01b733 Merge "include new settings lib to the apex-dependency allow list" into sc-dev 2021-03-11 04:51:40 +00:00
Paul Duffin
e5e761eab2 Merge "Avoid calling DepIsInSameApex when excluded from apex contents" am: 9c2e6d50b4 am: 46a694ba85 am: 4ea76e8caf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626500

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6248a20ea0b929286691a083fa5e5a93ea65285
2021-03-11 03:04:16 +00:00
Paul Duffin
4ea76e8caf Merge "Avoid calling DepIsInSameApex when excluded from apex contents" am: 9c2e6d50b4 am: 46a694ba85
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626500

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3b078034869c482a624c66b1093fb97e0ae6871
2021-03-11 02:19:40 +00:00
Treehugger Robot
215725913c Merge "update apex/allowed_deps.txt" 2021-03-11 01:35:46 +00:00
Paul Duffin
9c2e6d50b4 Merge "Avoid calling DepIsInSameApex when excluded from apex contents" 2021-03-10 23:30:48 +00:00
Paul Duffin
d3bf0fad8f Merge "Extract apex registration code into function for reuse" am: 3d3f7a0c3f am: 5dccf644f1 am: 0f9e7887fa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625379

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ea84198248eab3591b7b065b065478ac400bd01
2021-03-10 21:00:54 +00:00
Paul Duffin
0f9e7887fa Merge "Extract apex registration code into function for reuse" am: 3d3f7a0c3f am: 5dccf644f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625379

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c20a0a5a5fed0aae8cdbdb678f09474e09d8324
2021-03-10 20:12:30 +00:00
sophiez
fdfe8f74fd Fix getting list of module libraries in builder.go
Replace f.stem to f.Stem() method otherwise empty libNames get passed
in.

Fixes:181991887

Test: DIST_DIR=~/my_dist_dir TARGET_BUILD_VARIANT=userdebug PRODUCT=mainline_modules_x86 ./vendor/google/build/build_unbundled_coverage_mainline_module.sh -j80

Change-Id: I3384f3a73c5637928584b9d87b2f936116a8f15e
Merged-In: Ie1799c0972d63da823ad375f008018de782529d1
2021-03-10 19:27:54 +00:00
Paul Duffin
3d3f7a0c3f Merge "Extract apex registration code into function for reuse" 2021-03-10 17:31:13 +00:00
Paul Duffin
e9612824ea Avoid calling DepIsInSameApex when excluded from apex contents
While debugging an issue with some work I was doing on boot image
modules I noticed that markPlatformAvailability() is calling
DepIsInSameApex() even when the dependency tag indicates that it is
excluded from the apex contents.

Test: m droid
Change-Id: Iac49049546a886f7a3a0d9640ffd31ce24c61364
2021-03-10 16:44:57 +00:00
Paul Duffin
043f5e7881 Treat core_platform as stable unless module uses legacy
The sdk_version: "core_platform" refers to the stable core platform
unless the module is in the exception list. This change makes sure that
CheckStableSdkVersion() reflects that behavior.

Bug: 180399951
Test: m nothing
Change-Id: Ia0b1e13322352b87f5a3c6621e37f23ba637ffb6
2021-03-10 13:04:03 +00:00
Jeongik Cha
5225ca9434 update apex/allowed_deps.txt
Bug: 150578172
Test: m
Change-Id: I0ea6b33c2d27081a5f0622edb0f5df4088a71455
Merged-In: I0ea6b33c2d27081a5f0622edb0f5df4088a71455
2021-03-10 09:16:14 +09:00
Paul Duffin
667893c657 Extract apex registration code into function for reuse
Test: m nothing
Change-Id: Id2c918891ecd9e874004f6828f71374bf0cdb9e4
2021-03-09 23:03:40 +00:00
TreeHugger Robot
98a2c750dd Merge "update apex/allowed_deps.txt" into mainline-prod 2021-03-09 22:03:39 +00:00
Jooyung Han
7eb6684058 Merge "Run "prebuilt_postdeps" mutator again" am: 77e7d7769e am: 1226de1315 am: b2821d6c8c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620647

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68944034e6b09d866466fb10d7caf7c0539de6ec
2021-03-09 18:23:21 +00:00
Jooyung Han
b2821d6c8c Merge "Run "prebuilt_postdeps" mutator again" am: 77e7d7769e am: 1226de1315
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620647

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8fec1a135d285d296ce4121a725a64f443fc0f51
2021-03-09 17:38:39 +00:00
Jooyung Han
77e7d7769e Merge "Run "prebuilt_postdeps" mutator again" 2021-03-09 16:21:33 +00:00
Tony Mak
9418d6747f Allow ExtServices to use tflite_support
tflite_support provides some tflite ops and utils functions.

> How big is the binary size increase for affected APEXes?
+100K
> Is the new dependency committed to support previous platform releases?
note that you have to support all the releases starting from the minSdkVersion value you are declaring
Yes.
> Is the new dependency being developed AOSP-first or internal?
AOSP-first. We don't "develop" it there tho.
We import the code from github and the library is developed by another
team in google.
> What’s the testing strategy for the new dependency? Does it have its own tests, and are you adding integration tests?
We test the library with our own unit and integration tests.

Bug: 169147920

Test: build/soong/scripts/update-apex-allowed-deps.sh

Change-Id: Ic15226dd36dce98f9a3e54672353f87adcc6312f
2021-03-09 12:02:00 +00:00
Treehugger Robot
f58582a3c1 Merge "Introduce derive_classpath service." am: c285125110 am: eb4bc50101
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1614805

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I79df795b34714b5f12c2d34302096c40672ca1f5
2021-03-09 11:50:04 +00:00
Treehugger Robot
c285125110 Merge "Introduce derive_classpath service." 2021-03-09 10:23:49 +00:00
TreeHugger Robot
f053d84257 Merge "update apex/allowed_deps.txt" into sc-dev 2021-03-09 07:14:19 +00:00
Jooyung Han
86feead0d5 Run "prebuilt_postdeps" mutator again
Because OverridablePropertiesDepsMutator is run after prebuilt_postdeps,
prebuilt's replacement doesn't affect to those deps added by overridable
properties.

By running prebuilt_postdeps again after
OverridablePropertiesDepsMutator, replacing source with prebuilts is
applied to those deps.

Bug: 152155285
Bug: 181953909
Bug: 181974714
Test: m nothing
Change-Id: I24acc02785c9580c2beca096042f1173eb28ba9a
2021-03-09 11:23:46 +09:00