Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28ba8066 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I0ab8459b,I2ef90f4d 

* changes:
  Create core-lambda-stubs from .txt files
  Fix the suffix used in names of java_system_modules
parents 32952b97 760f8804

java/core-libraries/TxtStubLibraries.bp

+20 −6
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ java_library { 
        "system-modules-no-annotations",

    ],

    static_libs: [

        "core.current.stubs.from-txt",

        "core-lambda-stubs-for-system-modules",

        "core.current.stubs.from-text",

        "core-lambda-stubs.from-text",

    ],

    // TODO: Enable after stub generation from .txt file is available

    enabled: false,
@@ -58,8 +58,8 @@ java_library { 
        "system-modules-no-annotations",

    ],

    static_libs: [

        "core.module_lib.stubs.txt",

        "core-lambda-stubs-for-system-modules",

        "core.module_lib.stubs.from-text",

        "core-lambda-stubs.from-text",

    ],

    // TODO: Enable after stub generation from .txt file is available

    enabled: false,
@@ -89,7 +89,7 @@ java_system_modules { 
    visibility: core_platform_visibility,

    libs: [

        "legacy.core.platform.api.no.annotations.stubs.from-text",

        "core-lambda-stubs-for-system-modules",

        "core-lambda-stubs.from-text",

    ],

    // TODO: Enable after stub generation from .txt file is available

    enabled: false,
@@ -118,7 +118,7 @@ java_system_modules { 
    visibility: core_platform_visibility,

    libs: [

        "stable.core.platform.api.no.annotations.stubs.from-text",

        "core-lambda-stubs-for-system-modules",

        "core-lambda-stubs.from-text",

    ],

    // TODO: Enable after stub generation from .txt file is available

    enabled: false,
@@ -140,3 +140,17 @@ java_library { 
    // TODO: Enable after stub generation from .txt file is available

    enabled: false,

}



java_api_library {

    name: "core-lambda-stubs.from-text",

    api_surface: "toolchain",

    api_contributions: [

        "art.module.toolchain.api.api.contribution",

    ],

    libs: [

        // LambdaMetaFactory depends on CallSite etc. which is part of the Core API surface

        "core.current.stubs.from-text",

    ],

    // TODO: Enable after stub generation from .txt file is available

    enabled: false,

}

java/sdk.go

+2 −2
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext android.SdkContext) 
		systemModules := android.JavaApiLibraryName(ctx.Config(), fmt.Sprintf("core-%s-stubs-system-modules", systemModulesKind))

		return sdkDep{

			useModule:          true,

			bootclasspath:      []string{module, config.DefaultLambdaStubsLibrary},

			bootclasspath:      []string{module, android.JavaApiLibraryName(ctx.Config(), config.DefaultLambdaStubsLibrary)},

			systemModules:      systemModules,

			java9Classpath:     []string{module},

			frameworkResModule: "framework-res",
@@ -197,7 +197,7 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext android.SdkContext) 
	case android.SdkCore:

		return sdkDep{

			useModule:        true,

			bootclasspath:    []string{android.SdkCore.JavaLibraryName(ctx.Config()), config.DefaultLambdaStubsLibrary},

			bootclasspath:    []string{android.SdkCore.JavaLibraryName(ctx.Config()), android.JavaApiLibraryName(ctx.Config(), config.DefaultLambdaStubsLibrary)},

			systemModules:    android.JavaApiLibraryName(ctx.Config(), "core-public-stubs-system-modules"),

			noFrameworksLibs: true,

		}