Merge changes I0116f5f4,I950c9b54,I967f5c42
* changes: Treat java libraries in classpath fragments as directly in apex Make CopyDirectlyInAnyApex match the documentation Remove unused cc.copyDirectlyInAnyApexDependencyTag
This commit is contained in:
@@ -22,6 +22,7 @@ import (
|
||||
|
||||
"android/soong/android"
|
||||
"android/soong/dexpreopt"
|
||||
|
||||
"github.com/google/blueprint/proptools"
|
||||
|
||||
"github.com/google/blueprint"
|
||||
@@ -76,12 +77,17 @@ func (b bootclasspathFragmentContentDependencyTag) ExportMember() bool {
|
||||
return true
|
||||
}
|
||||
|
||||
// Contents of bootclasspath fragments in an apex are considered to be directly in the apex, as if
|
||||
// they were listed in java_libs.
|
||||
func (b bootclasspathFragmentContentDependencyTag) CopyDirectlyInAnyApex() {}
|
||||
|
||||
// The tag used for the dependency between the bootclasspath_fragment module and its contents.
|
||||
var bootclasspathFragmentContentDepTag = bootclasspathFragmentContentDependencyTag{}
|
||||
|
||||
var _ android.ExcludeFromVisibilityEnforcementTag = bootclasspathFragmentContentDepTag
|
||||
var _ android.ReplaceSourceWithPrebuilt = bootclasspathFragmentContentDepTag
|
||||
var _ android.SdkMemberTypeDependencyTag = bootclasspathFragmentContentDepTag
|
||||
var _ android.CopyDirectlyInAnyApexTag = bootclasspathFragmentContentDepTag
|
||||
|
||||
func IsBootclasspathFragmentContentDepTag(tag blueprint.DependencyTag) bool {
|
||||
return tag == bootclasspathFragmentContentDepTag
|
||||
|
@@ -17,6 +17,7 @@ package java
|
||||
import (
|
||||
"android/soong/android"
|
||||
"android/soong/dexpreopt"
|
||||
|
||||
"github.com/google/blueprint"
|
||||
)
|
||||
|
||||
@@ -118,6 +119,12 @@ type systemServerClasspathFragmentContentDependencyTag struct {
|
||||
blueprint.BaseDependencyTag
|
||||
}
|
||||
|
||||
// Contents of system server fragments in an apex are considered to be directly in the apex, as if
|
||||
// they were listed in java_libs.
|
||||
func (systemServerClasspathFragmentContentDependencyTag) CopyDirectlyInAnyApex() {}
|
||||
|
||||
var _ android.CopyDirectlyInAnyApexTag = systemServerClasspathFragmentContentDepTag
|
||||
|
||||
// The tag used for the dependency between the systemserverclasspath_fragment module and its contents.
|
||||
var systemServerClasspathFragmentContentDepTag = systemServerClasspathFragmentContentDependencyTag{}
|
||||
|
||||
|
Reference in New Issue
Block a user