Merge "CompilerDeviceProperties are added to the sdk impl library" (b1a96e5e) · Commits · e / os / android_build_soong

java/sdk_library.go

+4 −2

Original line number	Diff line number	Diff line
		@@ -114,6 +114,7 @@ type sdkLibrary struct {
		android.DefaultableModuleBase

		properties sdkLibraryProperties
		deviceProperties CompilerDeviceProperties

		publicApiStubsPath android.Paths
		systemApiStubsPath android.Paths
		@@ -405,7 +406,7 @@ func (module *sdkLibrary) createImplLibrary(mctx android.TopDownMutatorContext)
		props.Product_specific = proptools.BoolPtr(true)
		}

		mctx.CreateModule(android.ModuleFactoryAdaptor(LibraryFactory(true)), &props)
		mctx.CreateModule(android.ModuleFactoryAdaptor(LibraryFactory(true)), &props, &module.deviceProperties)
		}

		// Creates the xml file that publicizes the runtime library
		@@ -523,6 +524,7 @@ func sdkLibraryMutator(mctx android.TopDownMutatorContext) {
		func sdkLibraryFactory() android.Module {
		module := &sdkLibrary{}
		module.AddProperties(&module.properties)
		module.AddProperties(&module.deviceProperties)
		android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
		android.InitDefaultableModule(module)
		return module