summaryrefslogtreecommitdiff
path: root/java/sdk.go
diff options
context:
space:
mode:
author Pete Gillin <peteg@google.com> 2020-07-01 13:05:32 +0100
committer Pete Gillin <peteg@google.com> 2020-07-01 13:05:32 +0100
commit7b0bdce69eef1b950662a7b493b4cc350da718c0 (patch)
tree467a5b11041cc3c18f681758fcc1b39e327fe3aa /java/sdk.go
parente3d44b245b417964268ec7d722ee0354431e4fab (diff)
Remove frameworkResModule from sdkCorePlatform.
This seems unnecessary: modules using `sdk_version: "core_platform"` don't expect frameworks dependencies. Test: m framework Change-Id: Ib7ad715d1f4b4934c3c4a84839f4ead85a5abb29
Diffstat (limited to 'java/sdk.go')
-rw-r--r--java/sdk.go9
1 files changed, 4 insertions, 5 deletions
diff --git a/java/sdk.go b/java/sdk.go
index 4fffd8634..e3472cea3 100644
--- a/java/sdk.go
+++ b/java/sdk.go
@@ -437,11 +437,10 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext sdkContext) sdkDep
}
case sdkCorePlatform:
return sdkDep{
- useModule: true,
- systemModules: config.LegacyCorePlatformSystemModules,
- bootclasspath: config.LegacyCorePlatformBootclasspathLibraries,
- frameworkResModule: "framework-res",
- noFrameworksLibs: true,
+ useModule: true,
+ systemModules: config.LegacyCorePlatformSystemModules,
+ bootclasspath: config.LegacyCorePlatformBootclasspathLibraries,
+ noFrameworksLibs: true,
}
case sdkPublic:
return toModule([]string{"android_stubs_current"}, "framework-res", sdkFrameworkAidlPath(ctx))