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

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

Merge changes Ifd3117a4,Ic4f8b2b1 

* changes:
  Revert "apex: skip symbol files when replaced with prebuilt"
  override_apex can be replaced with apex_set
parents 167f917f 41836421

android/override_module.go

+3 −2
Original line number Diff line number Diff line
@@ -304,8 +304,9 @@ func performOverrideMutator(ctx BottomUpMutatorContext) { 
		for i, o := range overrides {

			mods[i+1].(OverridableModule).override(ctx, o)

			if o.getOverriddenByPrebuilt() {

				// The overriding module itself, too, is overridden by a prebuilt. Skip its installation.

				mods[i+1].HideFromMake()

				// The overriding module itself, too, is overridden by a prebuilt.

				// Copy the flag and hide it in make

				mods[i+1].ReplacedByPrebuilt()

			}

		}

	} else if o, ok := ctx.Module().(OverrideModule); ok {

apex/apex_test.go

+0 −61
Original line number Diff line number Diff line
@@ -5689,67 +5689,6 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { 
	})

}



func TestPrebuiltSkipsSymbols(t *testing.T) {

	testCases := []struct {

		name               string

		usePrebuilt        bool

		installSymbolFiles bool

	}{

		{

			name:               "Source module build rule doesn't install symbol files",

			usePrebuilt:        true,

			installSymbolFiles: false,

		},

		{

			name:               "Source module is installed with symbols",

			usePrebuilt:        false,

			installSymbolFiles: true,

		},

	}

	for _, tc := range testCases {

		t.Run(tc.name, func(t *testing.T) {

			preferProperty := "prefer: false"

			if tc.usePrebuilt {

				preferProperty = "prefer: true"

			}

			ctx := testApex(t, `

				// Source module

				apex {

					name: "myapex",

					binaries: ["foo"],

					key: "myapex.key",

					updatable: false,

				}



				apex_key {

					name: "myapex.key",

					public_key: "testkey.avbpubkey",

					private_key: "testkey.pem",

				}



				apex_set {

					name: "myapex",

					set: "myapex.apks",

					`+preferProperty+`

				}



				cc_binary {

					name: "foo",

					srcs: ["mylib.cpp"],

					system_shared_libs: [],

					stl: "none",

					apex_available: [ "myapex" ],

				}

			`)

			// Symbol files are installed by installing entries under ${OUT}/apex/{apex name}

			android.AssertStringListContainsEquals(t, "Installs",

				ctx.ModuleForTests("myapex", "android_common_myapex_image").Module().FilesToInstall().Strings(),

				filepath.Join(ctx.Config().SoongOutDir(), "target/product/test_device/apex/myapex/bin/foo"),

				tc.installSymbolFiles)

		})

	}

}



func TestApexWithTests(t *testing.T) {

	ctx := testApex(t, `

		apex_test {

apex/builder.go

+0 −4
Original line number Diff line number Diff line
@@ -468,10 +468,6 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { 
	imageDir := android.PathForModuleOut(ctx, "image"+suffix)



	installSymbolFiles := (!ctx.Config().KatiEnabled() || a.ExportedToMake()) && a.installable()

	// We can't install symbol files when prebuilt is used.

	if a.IsReplacedByPrebuilt() {

		installSymbolFiles = false

	}



	// set of dependency module:location mappings

	installMapSet := make(map[string]bool)