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

Commit 58dace84 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Do not instrument the implementation library of sdk_library" into main

parents a6ecdd39 34155e33

java/sdk_library.go

+8 −3
Original line number Original line Diff line number Diff line
@@ -1650,6 +1650,14 @@ func (module *SdkLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) 
		module.dexpreopter.configPath = module.implLibraryModule.dexpreopter.configPath

		module.dexpreopter.configPath = module.implLibraryModule.dexpreopter.configPath

		module.dexpreopter.outputProfilePathOnHost = module.implLibraryModule.dexpreopter.outputProfilePathOnHost

		module.dexpreopter.outputProfilePathOnHost = module.implLibraryModule.dexpreopter.outputProfilePathOnHost





		// Properties required for Library.AndroidMkEntries

		module.logtagsSrcs = module.implLibraryModule.logtagsSrcs

		module.dexpreopter.builtInstalled = module.implLibraryModule.dexpreopter.builtInstalled

		module.jacocoReportClassesFile = module.implLibraryModule.jacocoReportClassesFile

		module.dexer.proguardDictionary = module.implLibraryModule.dexer.proguardDictionary

		module.dexer.proguardUsageZip = module.implLibraryModule.dexer.proguardUsageZip

		module.linter.reports = module.implLibraryModule.linter.reports



		if !module.Host() {

		if !module.Host() {

			module.hostdexInstallFile = module.implLibraryModule.hostdexInstallFile

			module.hostdexInstallFile = module.implLibraryModule.hostdexInstallFile

		}

		}
@@ -1814,7 +1822,6 @@ func (module *SdkLibrary) createImplLibrary(mctx android.DefaultableHookContext) 
	props := struct {

	props := struct {

		Name           *string

		Name           *string

		Visibility     []string

		Visibility     []string

		Instrument     bool

		Libs           []string

		Libs           []string

		Static_libs    []string

		Static_libs    []string

		Apex_available []string

		Apex_available []string
@@ -1822,8 +1829,6 @@ func (module *SdkLibrary) createImplLibrary(mctx android.DefaultableHookContext) 
	}{

	}{

		Name:       proptools.StringPtr(module.implLibraryModuleName()),

		Name:       proptools.StringPtr(module.implLibraryModuleName()),

		Visibility: visibility,

		Visibility: visibility,

		// Set the instrument property to ensure it is instrumented when instrumentation is required.

		Instrument: true,





		Libs: append(module.properties.Libs, module.sdkLibraryProperties.Impl_only_libs...),

		Libs: append(module.properties.Libs, module.sdkLibraryProperties.Impl_only_libs...),