Merge "Allow framework-media to build the framework-media.impl" (fb14b527) · Commits · e / os / android_build_soong

java/sdk_library.go

+17 −5

Original line number	Diff line number	Diff line
		@@ -377,6 +377,9 @@ type sdkLibraryProperties struct {
		// List of Java libraries that will be in the classpath when building the implementation lib
		Impl_only_libs []string `android:"arch_variant"`

		// List of Java libraries that will included in the implementation lib.
		Impl_only_static_libs []string `android:"arch_variant"`

		// List of Java libraries that will be in the classpath when building stubs
		Stub_only_libs []string `android:"arch_variant"`

		@@ -1350,6 +1353,8 @@ func (module *SdkLibrary) createImplLibrary(mctx android.DefaultableHookContext)
		Visibility []string
		Instrument bool
		Libs []string
		Static_libs []string
		Apex_available []string
		}{
		Name: proptools.StringPtr(module.implLibraryModuleName()),
		Visibility: visibility,
		@@ -1358,6 +1363,12 @@ func (module *SdkLibrary) createImplLibrary(mctx android.DefaultableHookContext)
		// Set the impl_only libs. Note that the module's "Libs" get appended as well, via the
		// addition of &module.properties below.
		Libs: module.sdkLibraryProperties.Impl_only_libs,
		// Set the impl_only static libs. Note that the module's "static_libs" get appended as well, via the
		// addition of &module.properties below.
		Static_libs: module.sdkLibraryProperties.Impl_only_static_libs,
		// Pass the apex_available settings down so that the impl library can be statically
		// embedded within a library that is added to an APEX. Needed for updatable-media.
		Apex_available: module.ApexAvailable(),
		}

		properties := []interface{}{
		@@ -1814,8 +1825,9 @@ func (module *SdkLibrary) CreateInternalModules(mctx android.DefaultableHookCont
		javaSdkLibraries = append(javaSdkLibraries, module.BaseModuleName())
		}

		// Add the impl_only_libs after we're done using the Libs prop in submodules.
		// Add the impl_only_libs and impl_only_static_libs after we're done using them in submodules.
		module.properties.Libs = append(module.properties.Libs, module.sdkLibraryProperties.Impl_only_libs...)
		module.properties.Static_libs = append(module.properties.Static_libs, module.sdkLibraryProperties.Impl_only_static_libs...)
		}

		func (module *SdkLibrary) InitSdkLibraryProperties() {