Merge "Add system_ext_specific" (4858e417) · Commits · e / os / android_build_soong

java/sdk_library.go

+32 −21

Original line number	Diff line number	Diff line
		@@ -293,6 +293,8 @@ func (module *SdkLibrary) implPath() string {
		partition = "odm"
		} else if module.ProductSpecific() {
		partition = "product"
		} else if module.SystemExtSpecific() {
		partition = "system_ext"
		}
		return "/" + partition + "/framework/" + module.implName() + ".jar"
		}
		@@ -370,6 +372,7 @@ func (module *SdkLibrary) createStubsLibrary(mctx android.LoadHookContext, apiSc
		Soc_specific *bool
		Device_specific *bool
		Product_specific *bool
		System_ext_specific *bool
		Compile_dex *bool
		System_modules *string
		Java_version *string
		@@ -417,6 +420,8 @@ func (module *SdkLibrary) createStubsLibrary(mctx android.LoadHookContext, apiSc
		props.Device_specific = proptools.BoolPtr(true)
		} else if module.ProductSpecific() {
		props.Product_specific = proptools.BoolPtr(true)
		} else if module.SystemExtSpecific() {
		props.System_ext_specific = proptools.BoolPtr(true)
		}

		mctx.CreateModule(LibraryFactory, &props)
		@@ -567,6 +572,7 @@ func (module *SdkLibrary) createXmlFile(mctx android.LoadHookContext) {
		Soc_specific *bool
		Device_specific *bool
		Product_specific *bool
		System_ext_specific *bool
		}{}
		etcProps.Name = proptools.StringPtr(module.xmlFileName())
		etcProps.Src = proptools.StringPtr(":" + module.xmlFileName() + "-gen")
		@@ -577,6 +583,8 @@ func (module *SdkLibrary) createXmlFile(mctx android.LoadHookContext) {
		etcProps.Device_specific = proptools.BoolPtr(true)
		} else if module.ProductSpecific() {
		etcProps.Product_specific = proptools.BoolPtr(true)
		} else if module.SystemExtSpecific() {
		etcProps.System_ext_specific = proptools.BoolPtr(true)
		}
		mctx.CreateModule(android.PrebuiltEtcFactory, &etcProps)
		}
		@@ -799,6 +807,7 @@ func (module *sdkLibraryImport) createInternalModules(mctx android.LoadHookConte
		Soc_specific *bool
		Device_specific *bool
		Product_specific *bool
		System_ext_specific *bool
		}{}

		props.Name = proptools.StringPtr(module.BaseModuleName() + sdkStubsLibrarySuffix)
		@@ -809,6 +818,8 @@ func (module *sdkLibraryImport) createInternalModules(mctx android.LoadHookConte
		props.Device_specific = proptools.BoolPtr(true)
		} else if module.ProductSpecific() {
		props.Product_specific = proptools.BoolPtr(true)
		} else if module.SystemExtSpecific() {
		props.System_ext_specific = proptools.BoolPtr(true)
		}

		mctx.CreateModule(ImportFactory, &props, &module.properties)