diff options
| author | 2024-06-02 07:07:02 -0700 | |
|---|---|---|
| committer | 2024-06-02 07:24:51 -0700 | |
| commit | 01d31bdc9838c5d00edfb1422ab77a3582e8c02f (patch) | |
| tree | 500cf92a50d7882245c1f3cab544f1bfe8820443 /tradefed | |
| parent | d5e16ac52be02e2c41c47964a3b5dbc776bd6799 (diff) | |
Reapply "Change test_module_config from copying files to symlink ..."
This reverts commit c6a321e4dee7ce2a832a9308ab4c7279a1cd0dfb.
Original commit broke whe building sdk/ndk in postsubmit because of
missing target arch.
See: https://android-build.corp.google.com/artifact/submitted/11914755/mainline_modules_sdks-trunk_staging-userdebug/latest/view/logs%2Fbuild_error.log
Reapplying originaly commit and adding fix in patchest.
Test: DIST_DIR=/usr/local/google/dist/bug TARGET_RELEASE=trunk_staging TARGET_BUILD_VARIANT=userdebug UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true packages/modules/common/build/mainline_modules_sdks.sh
Test: m general-tests
Change-Id: Id844feb7ff9750bcd5af890a9fd26f7342344965
Diffstat (limited to 'tradefed')
| -rw-r--r-- | tradefed/providers.go | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tradefed/providers.go b/tradefed/providers.go index 66cb6253b..0abac1279 100644 --- a/tradefed/providers.go +++ b/tradefed/providers.go @@ -6,7 +6,8 @@ import ( "github.com/google/blueprint" ) -// Output files we need from a base test that we derive from. +// Data that test_module_config[_host] modules types will need from +// their dependencies to write out build rules and AndroidMkEntries. type BaseTestProviderData struct { // data files and apps for android_test InstalledFiles android.Paths @@ -19,8 +20,14 @@ type BaseTestProviderData struct { RequiredModuleNames []string // List of test suites base uses. TestSuites []string - // Used for bases that are Host + // True indicates the base modules is built for Host. IsHost bool + // Base's sdk version for AndroidMkEntries, generally only used for Host modules. + LocalSdkVersion string + // Base's certificate for AndroidMkEntries, generally only used for device modules. + LocalCertificate string + // Indicates if the base module was a unit test. + IsUnitTest bool } var BaseTestProviderKey = blueprint.NewProvider[BaseTestProviderData]() |