Remove the internal extractor module created by apex_set am: 9d6e209f44 (59946005) · Commits · e / os / android_build_soong

apex/apex_test.go

+6 −6

Original line number	Diff line number	Diff line
		@@ -7862,9 +7862,9 @@ func TestAppSetBundlePrebuilt(t *testing.T) {
		ctx := testApex(t, bp, prepareForTestWithSantitizeHwaddress)

		// Check that the extractor produces the correct output file from the correct input file.
		extractorOutput := "out/soong/.intermediates/prebuilt_myapex.apex.extractor/android_common/extracted/myapex.hwasan.apks"
		extractorOutput := "out/soong/.intermediates/myapex/android_common_myapex/extracted/myapex.hwasan.apks"

		m := ctx.ModuleForTests("prebuilt_myapex.apex.extractor", "android_common")
		m := ctx.ModuleForTests("myapex", "android_common_myapex")
		extractedApex := m.Output(extractorOutput)

		android.AssertArrayString(t, "extractor input", []string{"myapex.hwasan.apks"}, extractedApex.Inputs.Strings())
		@@ -7889,10 +7889,10 @@ func TestApexSetApksModuleAssignment(t *testing.T) {
		}
		`)

		m := ctx.ModuleForTests("prebuilt_myapex.apex.extractor", "android_common")
		m := ctx.ModuleForTests("myapex", "android_common_myapex")

		// Check that the extractor produces the correct apks file from the input module
		extractorOutput := "out/soong/.intermediates/prebuilt_myapex.apex.extractor/android_common/extracted/myapex.apks"
		extractorOutput := "out/soong/.intermediates/myapex/android_common_myapex/extracted/myapex.apks"
		extractedApex := m.Output(extractorOutput)

		android.AssertArrayString(t, "extractor input", []string{"myapex.apks"}, extractedApex.Inputs.Strings())
		@@ -8454,7 +8454,7 @@ func TestApexSet(t *testing.T) {
		}),
		)

		m := ctx.ModuleForTests("prebuilt_myapex.apex.extractor", "android_common")
		m := ctx.ModuleForTests("myapex", "android_common_myapex")

		// Check extract_apks tool parameters.
		extractedApex := m.Output("extracted/myapex.apks")
		@@ -8495,7 +8495,7 @@ func TestApexSet_NativeBridge(t *testing.T) {
		}),
		)

		m := ctx.ModuleForTests("prebuilt_myapex.apex.extractor", "android_common")
		m := ctx.ModuleForTests("myapex", "android_common_myapex")

		// Check extract_apks tool parameters. No native bridge arch expected
		extractedApex := m.Output("extracted/myapex.apks")

apex/prebuilt.go

+30 −62

Original line number	Diff line number	Diff line
		@@ -253,6 +253,8 @@ func (p *prebuiltCommon) AndroidMkEntries() []android.AndroidMkEntries {
		return entriesList
		}

		// DEPRECATED. // TODO (spandandas): Remove this interface.

		// prebuiltApexModuleCreator defines the methods that need to be implemented by prebuilt_apex and
		// apex_set in order to create the modules needed to provide access to the prebuilt .apex file.
		type prebuiltApexModuleCreator interface {
		@@ -731,26 +733,11 @@ type prebuiltApexExtractorModule struct {
		extractedApex android.WritablePath
		}

		func privateApexExtractorModuleFactory() android.Module {
		module := &prebuiltApexExtractorModule{}
		module.AddProperties(
		&module.properties,
		)
		android.InitAndroidMultiTargetsArchModule(module, android.DeviceSupported, android.MultilibCommon)
		return module
		}

		func (p *prebuiltApexExtractorModule) Srcs() android.Paths {
		return android.Paths{p.extractedApex}
		}

		func (p *prebuiltApexExtractorModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
		srcsSupplier := func(ctx android.BaseModuleContext, prebuilt android.Module) []string {
		return p.properties.prebuiltSrcs(ctx)
		}
		// extract registers the build actions to extract an apex from .apks file
		// returns the path of the extracted apex
		func extract(ctx android.ModuleContext, apexSet android.Path, prerelease *bool) android.Path {
		defaultAllowPrerelease := ctx.Config().IsEnvTrue("SOONG_ALLOW_PRERELEASE_APEXES")
		apexSet := android.SingleSourcePathFromSupplier(ctx, srcsSupplier, "set")
		p.extractedApex = android.PathForModuleOut(ctx, "extracted", apexSet.Base())
		extractedApex := android.PathForModuleOut(ctx, "extracted", apexSet.Base())
		// Filter out NativeBridge archs (b/260115309)
		abis := java.SupportedAbis(ctx, true)
		ctx.Build(pctx,
		@@ -758,14 +745,16 @@ func (p *prebuiltApexExtractorModule) GenerateAndroidBuildActions(ctx android.Mo
		Rule: extractMatchingApex,
		Description: "Extract an apex from an apex set",
		Inputs: android.Paths{apexSet},
		Output: p.extractedApex,
		Output: extractedApex,
		Args: map[string]string{
		"abis": strings.Join(abis, ","),
		"allow-prereleased": strconv.FormatBool(proptools.BoolDefault(p.properties.Prerelease, defaultAllowPrerelease)),
		"allow-prereleased": strconv.FormatBool(proptools.BoolDefault(prerelease, defaultAllowPrerelease)),
		"sdk-version": ctx.Config().PlatformSdkVersion().String(),
		"skip-sdk-check": strconv.FormatBool(ctx.Config().IsEnvTrue("SOONG_SKIP_APPSET_SDK_CHECK")),
		},
		})
		},
		)
		return extractedApex
		}

		type ApexSet struct {
		@@ -834,45 +823,16 @@ func (a *ApexSet) hasSanitizedSource(sanitizer string) bool {
		func apexSetFactory() android.Module {
		module := &ApexSet{}
		module.AddProperties(&module.properties)
		module.initPrebuiltCommon(module, &module.properties.PrebuiltCommonProperties)

		return module
		}

		func createApexExtractorModule(ctx android.BottomUpMutatorContext, name string, apexExtractorProperties *ApexExtractorProperties) {
		props := struct {
		Name *string
		}{
		Name: proptools.StringPtr(name),
		}

		ctx.CreateModule(privateApexExtractorModuleFactory,
		&props,
		apexExtractorProperties,
		)
		}

		func apexExtractorModuleName(baseModuleName string) string {
		return baseModuleName + ".apex.extractor"
		}

		var _ prebuiltApexModuleCreator = (*ApexSet)(nil)

		// createPrebuiltApexModules creates modules necessary to export files from the apex set to other
		// modules.
		//
		// This effectively does for apex_set what Prebuilt.createPrebuiltApexModules does for a
		// prebuilt_apex except that instead of creating a selector module which selects one .apex file
		// from those provided this creates an extractor module which extracts the appropriate .apex file
		// from the zip file containing them.
		func (a *ApexSet) createPrebuiltApexModules(ctx android.BottomUpMutatorContext) {
		apexExtractorModuleName := apexExtractorModuleName(a.Name())
		createApexExtractorModule(ctx, apexExtractorModuleName, &a.properties.ApexExtractorProperties)
		module.prebuiltCommon.prebuiltCommonProperties = &module.properties.PrebuiltCommonProperties

		apexFileSource := ":" + apexExtractorModuleName
		// init the module as a prebuilt
		// even though this module type has srcs, use `InitPrebuiltModuleWithoutSrcs`, since the existing
		// InitPrebuiltModule* are not friendly with Sources of Configurable type.
		// The actual src will be evaluated in GenerateAndroidBuildActions.
		android.InitPrebuiltModuleWithoutSrcs(module)
		android.InitAndroidMultiTargetsArchModule(module, android.DeviceSupported, android.MultilibCommon)

		// After passing the arch specific src properties to the creating the apex selector module
		a.prebuiltCommonProperties.Selected_apex = proptools.StringPtr(apexFileSource)
		return module
		}

		func (a *ApexSet) ComponentDepsMutator(ctx android.BottomUpMutatorContext) {
		@@ -897,7 +857,15 @@ func (a *ApexSet) GenerateAndroidBuildActions(ctx android.ModuleContext) {
		ctx.ModuleErrorf("filename should end in %s or %s for apex_set", imageApexSuffix, imageCapexSuffix)
		}

		inputApex := android.OptionalPathForModuleSrc(ctx, a.prebuiltCommonProperties.Selected_apex).Path()
		var apexSet android.Path
		if srcs := a.properties.prebuiltSrcs(ctx); len(srcs) == 1 {
		apexSet = android.PathForModuleSrc(ctx, srcs[0])
		} else {
		ctx.ModuleErrorf("Expected exactly one source apex_set file, found %v\n", srcs)
		}

		extractedApex := extract(ctx, apexSet, a.properties.Prerelease)

		a.outputApex = android.PathForModuleOut(ctx, a.installFilename)

		// Build the output APEX. If compression is not enabled, make sure the output is not compressed even if the input is compressed
		@@ -907,7 +875,7 @@ func (a *ApexSet) GenerateAndroidBuildActions(ctx android.ModuleContext) {
		}
		ctx.Build(pctx, android.BuildParams{
		Rule: buildRule,
		Input: inputApex,
		Input: extractedApex,
		Output: a.outputApex,
		})

		@@ -916,7 +884,7 @@ func (a *ApexSet) GenerateAndroidBuildActions(ctx android.ModuleContext) {
		return
		}

		deapexerInfo := a.getDeapexerInfo(ctx, inputApex)
		deapexerInfo := a.getDeapexerInfo(ctx, extractedApex)

		// dexpreopt any system server jars if present
		a.dexpreoptSystemServerJars(ctx, deapexerInfo)