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

Commit 0d7dff48 authored by Sundong Ahn's avatar Sundong Ahn
Browse files

Add system_ext_specific 

The system_ext partition was created. So if java_sdk_library module is
installed to system_ext partition, .xml and .jar install path must be
changed to system_ext.

Bug: 143440787
Test: add system_ext_specific to java_sdk_module && make -j && check
system_ext parition

Change-Id: Ie0d0df426d4aa96ac89eb4215e7376eea3f03f54
parent f6739a65

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)