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

Commit 487cdc78 authored by Jihoon Kang's avatar Jihoon Kang Committed by Automerger Merge Worker
Browse files

Merge "Utilize from text core platform api surface jar in build" am: b4207052 am: 38c5c6e4 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2514755



Change-Id: I5fd210b10a26a051c54365cd64a4a3589bc432ab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 41c7499c 38c5c6e4

android/sdk_version.go

+9 −0
Original line number Diff line number Diff line
@@ -100,6 +100,15 @@ func JavaApiLibraryName(c Config, name string) string { 
	return name

}



// JavaApiLibraryNames applies JavaApiLibraryName to the list of java_library names.

func JavaApiLibraryNames(c Config, names []string) []string {

	apiLibs := make([]string, len(names))

	for i, name := range names {

		apiLibs[i] = JavaApiLibraryName(c, name)

	}

	return apiLibs

}



func (k SdkKind) DefaultJavaLibraryName() string {

	switch k {

	case SdkPublic:

java/base.go

+5 −2
Original line number Diff line number Diff line
@@ -1923,9 +1923,12 @@ type moduleWithSdkDep interface { 


func (m *Module) getSdkLinkType(ctx android.BaseModuleContext, name string) (ret sdkLinkType, stubs bool) {

	switch name {

	case android.SdkCore.JavaLibraryName(ctx.Config()), "legacy.core.platform.api.stubs", "stable.core.platform.api.stubs",

	case android.SdkCore.JavaLibraryName(ctx.Config()),

		android.JavaApiLibraryName(ctx.Config(), "legacy.core.platform.api.stubs"),

		android.JavaApiLibraryName(ctx.Config(), "stable.core.platform.api.stubs"),

		"stub-annotations", "private-stub-annotations-jar",

		"core-lambda-stubs", "core-generated-annotation-stubs":

		android.JavaApiLibraryName(ctx.Config(), "core-lambda-stubs"),

		"core-generated-annotation-stubs":

		return javaCore, true

	case android.SdkPublic.JavaLibraryName(ctx.Config()):

		return javaSdk, true

java/config/makevars.go

+5 −2
Original line number Diff line number Diff line
@@ -28,8 +28,11 @@ func makeVarsProvider(ctx android.MakeVarsContext) { 
	ctx.Strict("FRAMEWORK_LIBRARIES", strings.Join(FrameworkLibraries, " "))



	// These are used by make when LOCAL_PRIVATE_PLATFORM_APIS is set (equivalent to platform_apis in blueprint):

	ctx.Strict("LEGACY_CORE_PLATFORM_BOOTCLASSPATH_LIBRARIES", strings.Join(LegacyCorePlatformBootclasspathLibraries, " "))

	ctx.Strict("LEGACY_CORE_PLATFORM_SYSTEM_MODULES", LegacyCorePlatformSystemModules)

	ctx.Strict("LEGACY_CORE_PLATFORM_BOOTCLASSPATH_LIBRARIES",

		strings.Join(android.JavaApiLibraryNames(ctx.Config(), LegacyCorePlatformBootclasspathLibraries), " "))

	ctx.Strict("LEGACY_CORE_PLATFORM_SYSTEM_MODULES",

		android.JavaApiLibraryName(ctx.Config(), LegacyCorePlatformSystemModules),

	)



	ctx.Strict("ANDROID_JAVA_HOME", "${JavaHome}")

	ctx.Strict("ANDROID_JAVA8_HOME", "prebuilts/jdk/jdk8/${hostPrebuiltTag}")

java/hiddenapi_modular.go

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ func hiddenAPIComputeMonolithicStubLibModules(config android.Config) map[*Hidden 
		testStubModules = append(testStubModules, android.SdkTest.JavaLibraryName(config))

	}

	// We do not have prebuilts of the core platform api yet

	corePlatformStubModules = append(corePlatformStubModules, "legacy.core.platform.api.stubs")

	corePlatformStubModules = append(corePlatformStubModules, android.JavaApiLibraryName(config, "legacy.core.platform.api.stubs"))



	// Allow products to define their own stubs for custom product jars that apps can use.

	publicStubModules = append(publicStubModules, config.ProductHiddenAPIStubs()...)

java/java.go

+3 −1
Original line number Diff line number Diff line
@@ -456,7 +456,9 @@ func sdkDeps(ctx android.BottomUpMutatorContext, sdkContext android.SdkContext, 
		ctx.AddVariationDependencies(nil, java9LibTag, sdkDep.java9Classpath...)

		ctx.AddVariationDependencies(nil, sdkLibTag, sdkDep.classpath...)

		if d.effectiveOptimizeEnabled() && sdkDep.hasStandardLibs() {

			ctx.AddVariationDependencies(nil, proguardRaiseTag, config.LegacyCorePlatformBootclasspathLibraries...)

			ctx.AddVariationDependencies(nil, proguardRaiseTag,

				android.JavaApiLibraryNames(ctx.Config(), config.LegacyCorePlatformBootclasspathLibraries)...,

			)

		}

		if d.effectiveOptimizeEnabled() && sdkDep.hasFrameworkLibs() {

			ctx.AddVariationDependencies(nil, proguardRaiseTag, config.FrameworkLibraries...)