StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Export JavaBootLibsSdkMemberType and JavaSystemserverLibsSdkMemberType

Browse Source 
build/soong/sdk will use these tags to differentiate the sdk and non-sdk
contents of bootclasspath and systemserverclasspath fragments.

Test: go build ./java
Bug: 326246905

Change-Id: Ia8352c09fcbbca06988eb57153e5986801eb45a5
This commit is contained in:
Spandan Das
2024-03-20 21:22:47 +00:00
parent c36d579c2b
commit 159b264873
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/bootclasspath_fragment.go
View File

@@ -77,7 +77,7 @@ func (b bootclasspathFragmentContentDependencyTag) SdkMemberType(child android.M
return javaSdkLibrarySdkMemberType return javaSdkLibrarySdkMemberType
} }
return javaBootLibsSdkMemberType return JavaBootLibsSdkMemberType
} }
func (b bootclasspathFragmentContentDependencyTag) ExportMember() bool { func (b bootclasspathFragmentContentDependencyTag) ExportMember() bool {

8
java/java.go
View File

@@ -82,8 +82,8 @@ func RegisterJavaSdkMemberTypes() {
// Register sdk member types. // Register sdk member types.
android.RegisterSdkMemberType(javaHeaderLibsSdkMemberType) android.RegisterSdkMemberType(javaHeaderLibsSdkMemberType)
android.RegisterSdkMemberType(javaLibsSdkMemberType) android.RegisterSdkMemberType(javaLibsSdkMemberType)
android.RegisterSdkMemberType(javaBootLibsSdkMemberType) android.RegisterSdkMemberType(JavaBootLibsSdkMemberType)
android.RegisterSdkMemberType(javaSystemserverLibsSdkMemberType) android.RegisterSdkMemberType(JavaSystemserverLibsSdkMemberType)
android.RegisterSdkMemberType(javaTestSdkMemberType) android.RegisterSdkMemberType(javaTestSdkMemberType)
} }
@@ -154,7 +154,7 @@ var (
// either java_libs, or java_header_libs would end up exporting more information than was strictly // either java_libs, or java_header_libs would end up exporting more information than was strictly
// necessary. The java_boot_libs property to allow those modules to be exported as part of the // necessary. The java_boot_libs property to allow those modules to be exported as part of the
// sdk/module_exports without exposing any unnecessary information. // sdk/module_exports without exposing any unnecessary information.
javaBootLibsSdkMemberType = &librarySdkMemberType{ JavaBootLibsSdkMemberType = &librarySdkMemberType{
android.SdkMemberTypeBase{ android.SdkMemberTypeBase{
PropertyName: "java_boot_libs", PropertyName: "java_boot_libs",
SupportsSdk: true, SupportsSdk: true,
@@ -193,7 +193,7 @@ var (
// either java_libs, or java_header_libs would end up exporting more information than was strictly // either java_libs, or java_header_libs would end up exporting more information than was strictly
// necessary. The java_systemserver_libs property to allow those modules to be exported as part of // necessary. The java_systemserver_libs property to allow those modules to be exported as part of
// the sdk/module_exports without exposing any unnecessary information. // the sdk/module_exports without exposing any unnecessary information.
javaSystemserverLibsSdkMemberType = &librarySdkMemberType{ JavaSystemserverLibsSdkMemberType = &librarySdkMemberType{
android.SdkMemberTypeBase{ android.SdkMemberTypeBase{
PropertyName: "java_systemserver_libs", PropertyName: "java_systemserver_libs",
SupportsSdk: true, SupportsSdk: true,

2
java/systemserver_classpath_fragment.go
View File

@@ -189,7 +189,7 @@ func (b systemServerClasspathFragmentContentDependencyTag) SdkMemberType(child a
return javaSdkLibrarySdkMemberType return javaSdkLibrarySdkMemberType
} }
return javaSystemserverLibsSdkMemberType return JavaSystemserverLibsSdkMemberType
} }
func (b systemServerClasspathFragmentContentDependencyTag) ExportMember() bool { func (b systemServerClasspathFragmentContentDependencyTag) ExportMember() bool {