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

Commit 7d9deed9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Ib7ad715d,I3a83b5ed 

* changes:
  Remove frameworkResModule from sdkCorePlatform.
  Remove the concept of useDefaultLibs from Soong.
parents e6b5e9aa 7b0bdce6

java/droiddoc.go

+2 −7
Original line number Diff line number Diff line
@@ -440,16 +440,11 @@ func (j *Javadoc) targetSdkVersion() sdkSpec { 
func (j *Javadoc) addDeps(ctx android.BottomUpMutatorContext) {

	if ctx.Device() {

		sdkDep := decodeSdkDep(ctx, sdkContext(j))

		if sdkDep.useDefaultLibs {

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

			ctx.AddVariationDependencies(nil, systemModulesTag, config.LegacyCorePlatformSystemModules)

			if sdkDep.hasFrameworkLibs() {

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

			}

		} else if sdkDep.useModule {

		if sdkDep.useModule {

			ctx.AddVariationDependencies(nil, bootClasspathTag, sdkDep.bootclasspath...)

			ctx.AddVariationDependencies(nil, systemModulesTag, sdkDep.systemModules)

			ctx.AddVariationDependencies(nil, java9LibTag, sdkDep.java9Classpath...)

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

		}

	}

java/java.go

+9 −8
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ func IsStaticLibDepTag(depTag blueprint.DependencyTag) bool { 
}



type sdkDep struct {

	useModule, useFiles, useDefaultLibs, invalidVersion bool

	useModule, useFiles, invalidVersion bool



	// The modules that will be added to the bootclasspath when targeting 1.8 or lower

	bootclasspath []string
@@ -606,7 +606,11 @@ type sdkDep struct { 
	// modules are to be used.

	systemModules string



	// The modules that will be added to the classpath regardless of the Java language level targeted

	classpath []string



	// The modules that will be added ot the classpath when targeting 1.9 or higher

	// (normally these will be on the bootclasspath when targeting 1.8 or lower)

	java9Classpath []string



	frameworkResModule string
@@ -700,17 +704,14 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { 
		j.linter.deps(ctx)



		sdkDep := decodeSdkDep(ctx, sdkContext(j))

		if sdkDep.useDefaultLibs {

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

			ctx.AddVariationDependencies(nil, systemModulesTag, config.LegacyCorePlatformSystemModules)

			if sdkDep.hasFrameworkLibs() {

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

			}

		} else if sdkDep.useModule {

		if sdkDep.useModule {

			ctx.AddVariationDependencies(nil, bootClasspathTag, sdkDep.bootclasspath...)

			ctx.AddVariationDependencies(nil, java9LibTag, sdkDep.java9Classpath...)

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

			if j.deviceProperties.EffectiveOptimizeEnabled() && sdkDep.hasStandardLibs() {

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

			}

			if j.deviceProperties.EffectiveOptimizeEnabled() && sdkDep.hasFrameworkLibs() {

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

			}

		}

java/sdk.go

+8 −4
Original line number Diff line number Diff line
@@ -412,7 +412,10 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext sdkContext) sdkDep 
	switch sdkVersion.kind {

	case sdkPrivate:

		return sdkDep{

			useDefaultLibs:     true,

			useModule:          true,

			systemModules:      config.LegacyCorePlatformSystemModules,

			bootclasspath:      config.LegacyCorePlatformBootclasspathLibraries,

			classpath:          config.FrameworkLibraries,

			frameworkResModule: "framework-res",

		}

	case sdkNone:
@@ -434,8 +437,9 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext sdkContext) sdkDep 
		}

	case sdkCorePlatform:

		return sdkDep{

			useDefaultLibs:     true,

			frameworkResModule: "framework-res",

			useModule:        true,

			systemModules:    config.LegacyCorePlatformSystemModules,

			bootclasspath:    config.LegacyCorePlatformBootclasspathLibraries,

			noFrameworksLibs: true,

		}

	case sdkPublic: