diff options
Diffstat (limited to 'sdk/sdk.go')
-rw-r--r-- | sdk/sdk.go | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/sdk/sdk.go b/sdk/sdk.go index cb81a1466..4eb3665fb 100644 --- a/sdk/sdk.go +++ b/sdk/sdk.go @@ -29,6 +29,7 @@ import ( ) func init() { + pctx.Import("android/soong/android") android.RegisterModuleType("sdk", ModuleFactory) android.RegisterModuleType("sdk_snapshot", SnapshotModuleFactory) android.PreDepsMutators(RegisterPreDepsMutators) @@ -41,8 +42,7 @@ type sdk struct { properties sdkProperties - updateScript android.OutputPath - freezeScript android.OutputPath + snapshotFile android.OptionalPath } type sdkProperties struct { @@ -104,11 +104,24 @@ func (s *sdk) frozenVersions(ctx android.BaseModuleContext) []string { } func (s *sdk) GenerateAndroidBuildActions(ctx android.ModuleContext) { - s.buildSnapshotGenerationScripts(ctx) + if !s.snapshot() { + // We don't need to create a snapshot out of sdk_snapshot. + // That doesn't make sense. We need a snapshot to create sdk_snapshot. + s.snapshotFile = android.OptionalPathForPath(s.buildSnapshot(ctx)) + } } func (s *sdk) AndroidMkEntries() android.AndroidMkEntries { - return s.androidMkEntriesForScript() + if !s.snapshotFile.Valid() { + return android.AndroidMkEntries{} + } + + return android.AndroidMkEntries{ + Class: "FAKE", + OutputFile: s.snapshotFile, + DistFile: s.snapshotFile, + Include: "$(BUILD_PHONY_PACKAGE)", + } } // RegisterPreDepsMutators registers pre-deps mutators to support modules implementing SdkAware |