diff options
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/cc.go | 2 | ||||
| -rw-r--r-- | cc/testing.go | 3 | ||||
| -rw-r--r-- | cc/vendor_snapshot.go | 7 | ||||
| -rw-r--r-- | cc/vndk.go | 2 |
4 files changed, 10 insertions, 4 deletions
@@ -3034,7 +3034,7 @@ func squashRecoverySrcs(m *Module) { var _ android.ImageInterface = (*Module)(nil) func (m *Module) ImageMutatorBegin(mctx android.BaseModuleContext) { - // Sanity check + // Validation check vendorSpecific := mctx.SocSpecific() || mctx.DeviceSpecific() productSpecific := mctx.ProductSpecific() diff --git a/cc/testing.go b/cc/testing.go index 4d0b28b7f..c2353d8e6 100644 --- a/cc/testing.go +++ b/cc/testing.go @@ -20,8 +20,6 @@ import ( func RegisterRequiredBuildComponentsForTest(ctx android.RegistrationContext) { RegisterPrebuiltBuildComponents(ctx) - android.RegisterPrebuiltMutators(ctx) - RegisterCCBuildComponents(ctx) RegisterBinaryBuildComponents(ctx) RegisterLibraryBuildComponents(ctx) @@ -570,6 +568,7 @@ func CreateTestContext() *android.TestContext { ctx.RegisterModuleType("vndk_prebuilt_shared", VndkPrebuiltSharedFactory) ctx.RegisterModuleType("vndk_libraries_txt", VndkLibrariesTxtFactory) ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators) + android.RegisterPrebuiltMutators(ctx) RegisterRequiredBuildComponentsForTest(ctx) ctx.RegisterSingletonType("vndk-snapshot", VndkSnapshotSingleton) ctx.RegisterSingletonType("vendor-snapshot", VendorSnapshotSingleton) diff --git a/cc/vendor_snapshot.go b/cc/vendor_snapshot.go index fec0c8bb6..0af22580a 100644 --- a/cc/vendor_snapshot.go +++ b/cc/vendor_snapshot.go @@ -552,6 +552,13 @@ func isVendorSnapshotModule(m *Module, moduleDir string) bool { if _, ok := m.linker.(*kernelHeadersDecorator); ok { return false } + // skip llndk_library and llndk_headers which are backward compatible + if _, ok := m.linker.(*llndkStubDecorator); ok { + return false + } + if _, ok := m.linker.(*llndkHeadersDecorator); ok { + return false + } // Libraries if l, ok := m.linker.(snapshotLibraryInterface); ok { diff --git a/cc/vndk.go b/cc/vndk.go index 15843c6c6..f9adec73a 100644 --- a/cc/vndk.go +++ b/cc/vndk.go @@ -340,7 +340,7 @@ func processVndkLibrary(mctx android.BottomUpMutatorContext, m *Module) { } } -// Sanity check for modules that mustn't be VNDK +// Check for modules that mustn't be VNDK func shouldSkipVndkMutator(m *Module) bool { if !m.Enabled() { return true |