diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/app_test.go | 2 | ||||
| -rw-r--r-- | java/base.go | 2 | ||||
| -rw-r--r-- | java/bootclasspath_fragment.go | 4 | ||||
| -rw-r--r-- | java/core-libraries/Android.bp | 4 | ||||
| -rw-r--r-- | java/dexpreopt_bootjars.go | 6 | ||||
| -rw-r--r-- | java/java.go | 8 | ||||
| -rw-r--r-- | java/java_test.go | 2 | ||||
| -rw-r--r-- | java/platform_compat_config.go | 4 | ||||
| -rw-r--r-- | java/sdk_library.go | 4 | ||||
| -rw-r--r-- | java/system_modules.go | 4 |
10 files changed, 24 insertions, 16 deletions
diff --git a/java/app_test.go b/java/app_test.go index 56ad28d3e..07439fcd0 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -1737,7 +1737,7 @@ func TestPackageNameOverride(t *testing.T) { foo := result.ModuleForTests("foo", "android_common") - outSoongDir := result.Config.BuildDir() + outSoongDir := result.Config.SoongOutDir() outputs := foo.AllOutputs() outputMap := make(map[string]bool) diff --git a/java/base.go b/java/base.go index 8e6d1cd50..86022c3b2 100644 --- a/java/base.go +++ b/java/base.go @@ -791,7 +791,7 @@ func (j *Module) collectJavacFlags( // Manually specify build directory in case it is not under the repo root. // (javac doesn't seem to expand into symbolic links when searching for patch-module targets, so // just adding a symlink under the root doesn't help.) - patchPaths := []string{".", ctx.Config().BuildDir()} + patchPaths := []string{".", ctx.Config().SoongOutDir()} // b/150878007 // diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index 757731632..f7561b439 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -718,8 +718,8 @@ type bootclasspathFragmentMemberType struct { android.SdkMemberTypeBase } -func (b *bootclasspathFragmentMemberType) AddDependencies(mctx android.BottomUpMutatorContext, dependencyTag blueprint.DependencyTag, names []string) { - mctx.AddVariationDependencies(nil, dependencyTag, names...) +func (b *bootclasspathFragmentMemberType) AddDependencies(ctx android.SdkDependencyContext, dependencyTag blueprint.DependencyTag, names []string) { + ctx.AddVariationDependencies(nil, dependencyTag, names...) } func (b *bootclasspathFragmentMemberType) IsInstance(module android.Module) bool { diff --git a/java/core-libraries/Android.bp b/java/core-libraries/Android.bp index 51d998a2e..b198c2456 100644 --- a/java/core-libraries/Android.bp +++ b/java/core-libraries/Android.bp @@ -24,6 +24,10 @@ // core libraries. // // Don't use this directly, use "sdk_version: core_current". +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + java_library { name: "core.current.stubs", visibility: ["//visibility:public"], diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index 1019b4c85..946092cdb 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go @@ -500,7 +500,11 @@ func copyBootJarsToPredefinedLocations(ctx android.ModuleContext, srcBootDexJars dst := dstBootJarsByModule[name] if src == nil { - ctx.ModuleErrorf("module %s does not provide a dex boot jar", name) + if !ctx.Config().AllowMissingDependencies() { + ctx.ModuleErrorf("module %s does not provide a dex boot jar", name) + } else { + ctx.AddMissingDependencies([]string{name}) + } } else if dst == nil { ctx.ModuleErrorf("module %s is not part of the boot configuration", name) } else { diff --git a/java/java.go b/java/java.go index 4c2ca9ba2..1a052b432 100644 --- a/java/java.go +++ b/java/java.go @@ -574,8 +574,8 @@ const ( copyEverythingToSnapshot = false ) -func (mt *librarySdkMemberType) AddDependencies(mctx android.BottomUpMutatorContext, dependencyTag blueprint.DependencyTag, names []string) { - mctx.AddVariationDependencies(nil, dependencyTag, names...) +func (mt *librarySdkMemberType) AddDependencies(ctx android.SdkDependencyContext, dependencyTag blueprint.DependencyTag, names []string) { + ctx.AddVariationDependencies(nil, dependencyTag, names...) } func (mt *librarySdkMemberType) IsInstance(module android.Module) bool { @@ -875,8 +875,8 @@ type testSdkMemberType struct { android.SdkMemberTypeBase } -func (mt *testSdkMemberType) AddDependencies(mctx android.BottomUpMutatorContext, dependencyTag blueprint.DependencyTag, names []string) { - mctx.AddVariationDependencies(nil, dependencyTag, names...) +func (mt *testSdkMemberType) AddDependencies(ctx android.SdkDependencyContext, dependencyTag blueprint.DependencyTag, names []string) { + ctx.AddVariationDependencies(nil, dependencyTag, names...) } func (mt *testSdkMemberType) IsInstance(module android.Module) bool { diff --git a/java/java_test.go b/java/java_test.go index b6780c20c..8bb017f0b 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -1183,7 +1183,7 @@ func checkPatchModuleFlag(t *testing.T, ctx *android.TestContext, moduleName str break } } - if expected != android.StringPathRelativeToTop(ctx.Config().BuildDir(), got) { + if expected != android.StringPathRelativeToTop(ctx.Config().SoongOutDir(), got) { t.Errorf("Unexpected patch-module flag for module %q - expected %q, but got %q", moduleName, expected, got) } } diff --git a/java/platform_compat_config.go b/java/platform_compat_config.go index 712c2a203..0d8ebac02 100644 --- a/java/platform_compat_config.go +++ b/java/platform_compat_config.go @@ -134,8 +134,8 @@ type compatConfigMemberType struct { android.SdkMemberTypeBase } -func (b *compatConfigMemberType) AddDependencies(mctx android.BottomUpMutatorContext, dependencyTag blueprint.DependencyTag, names []string) { - mctx.AddVariationDependencies(nil, dependencyTag, names...) +func (b *compatConfigMemberType) AddDependencies(ctx android.SdkDependencyContext, dependencyTag blueprint.DependencyTag, names []string) { + ctx.AddVariationDependencies(nil, dependencyTag, names...) } func (b *compatConfigMemberType) IsInstance(module android.Module) bool { diff --git a/java/sdk_library.go b/java/sdk_library.go index c50e07779..ce8f179af 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -2471,8 +2471,8 @@ type sdkLibrarySdkMemberType struct { android.SdkMemberTypeBase } -func (s *sdkLibrarySdkMemberType) AddDependencies(mctx android.BottomUpMutatorContext, dependencyTag blueprint.DependencyTag, names []string) { - mctx.AddVariationDependencies(nil, dependencyTag, names...) +func (s *sdkLibrarySdkMemberType) AddDependencies(ctx android.SdkDependencyContext, dependencyTag blueprint.DependencyTag, names []string) { + ctx.AddVariationDependencies(nil, dependencyTag, names...) } func (s *sdkLibrarySdkMemberType) IsInstance(module android.Module) bool { diff --git a/java/system_modules.go b/java/system_modules.go index d0dc74adc..fec8ebaeb 100644 --- a/java/system_modules.go +++ b/java/system_modules.go @@ -245,8 +245,8 @@ type systemModulesSdkMemberType struct { android.SdkMemberTypeBase } -func (mt *systemModulesSdkMemberType) AddDependencies(mctx android.BottomUpMutatorContext, dependencyTag blueprint.DependencyTag, names []string) { - mctx.AddVariationDependencies(nil, dependencyTag, names...) +func (mt *systemModulesSdkMemberType) AddDependencies(ctx android.SdkDependencyContext, dependencyTag blueprint.DependencyTag, names []string) { + ctx.AddVariationDependencies(nil, dependencyTag, names...) } func (mt *systemModulesSdkMemberType) IsInstance(module android.Module) bool { |