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

Commit 574743cc authored by Roland Levillain's avatar Roland Levillain Committed by android-build-merger
Browse files

Merge "Fix some typos in Soong." am: 5260acef 

am: e41bbbf9

Change-Id: Ic5bf2a6c84e79b93757152643bb1fa1e5b7caced
parents 8273964e e41bbbf9

android/testing.go

+2 −2
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ func AndroidMkEntriesForTest(t *testing.T, config Config, bpPath string, mod blu 
	var p AndroidMkEntriesProvider

	var ok bool

	if p, ok = mod.(AndroidMkEntriesProvider); !ok {

		t.Errorf("module does not implmement AndroidMkEntriesProvider: " + mod.Name())

		t.Errorf("module does not implement AndroidMkEntriesProvider: " + mod.Name())

	}

	entries := p.AndroidMkEntries()

	entries.fillInEntries(config, bpPath, mod)
@@ -387,7 +387,7 @@ func AndroidMkDataForTest(t *testing.T, config Config, bpPath string, mod bluepr 
	var p AndroidMkDataProvider

	var ok bool

	if p, ok = mod.(AndroidMkDataProvider); !ok {

		t.Errorf("module does not implmement AndroidMkDataProvider: " + mod.Name())

		t.Errorf("module does not implement AndroidMkDataProvider: " + mod.Name())

	}

	data := p.AndroidMk()

	data.fillInData(config, bpPath, mod)

apex/apex.go

+1 −1
Original line number Diff line number Diff line
@@ -944,7 +944,7 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
	}

	if a.apexTypes.image() {

		// Build rule for unflattened APEX is created even when ctx.Config().FlattenApex()

		// is true. This is to support referencing APEX via ":<module_name" syntax

		// is true. This is to support referencing APEX via ":<module_name>" syntax

		// in other modules. It is in AndroidMk where the selection of flattened

		// or unflattened APEX is made.

		a.buildUnflattenedApex(ctx, imageApex)

cc/vndk.go

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ type VndkProperties struct { 
		// declared as a VNDK or VNDK-SP module. The vendor variant

		// will be installed in /system instead of /vendor partition.

		//

		// `vendor_vailable` must be explicitly set to either true or

		// `vendor_available` must be explicitly set to either true or

		// false together with `vndk: {enabled: true}`.

		Enabled *bool