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

Commit bf13546f authored by Jaewoong Jung's avatar Jaewoong Jung
Browse files

Add defaults support to runtime_resource_overlay. 

(This is a cherry-pick change.)

Bug: 154956723
Test: app_test.go
Change-Id: Ida29035ef45ec188c95a07a8bccaaa77eea486d7
Merged-In: Ida29035ef45ec188c95a07a8bccaaa77eea486d7
parent 01db2608

java/app_test.go

+59 −0
Original line number Diff line number Diff line
@@ -2538,3 +2538,62 @@ func TestRuntimeResourceOverlay(t *testing.T) { 
		t.Errorf("Unexpected LOCAL_MODULE_PATH value: %v, expected: %v", path, expectedPath)

	}

}



func TestRuntimeResourceOverlay_JavaDefaults(t *testing.T) {

	ctx, config := testJava(t, `

		java_defaults {

			name: "rro_defaults",

			theme: "default_theme",

			product_specific: true,

			aaptflags: ["--keep-raw-values"],

		}



		runtime_resource_overlay {

			name: "foo_with_defaults",

			defaults: ["rro_defaults"],

		}



		runtime_resource_overlay {

			name: "foo_barebones",

		}

		`)



	//

	// RRO module with defaults

	//

	m := ctx.ModuleForTests("foo_with_defaults", "android_common")



	// Check AAPT2 link flags.

	aapt2Flags := strings.Split(m.Output("package-res.apk").Args["flags"], " ")

	expectedFlags := []string{"--keep-raw-values", "--no-resource-deduping", "--no-resource-removal"}

	absentFlags := android.RemoveListFromList(expectedFlags, aapt2Flags)

	if len(absentFlags) > 0 {

		t.Errorf("expected values, %q are missing in aapt2 link flags, %q", absentFlags, aapt2Flags)

	}



	// Check device location.

	path := android.AndroidMkEntriesForTest(t, config, "", m.Module())[0].EntryMap["LOCAL_MODULE_PATH"]

	expectedPath := []string{"/tmp/target/product/test_device/product/overlay/default_theme"}

	if !reflect.DeepEqual(path, expectedPath) {

		t.Errorf("Unexpected LOCAL_MODULE_PATH value: %q, expected: %q", path, expectedPath)

	}



	//

	// RRO module without defaults

	//

	m = ctx.ModuleForTests("foo_barebones", "android_common")



	// Check AAPT2 link flags.

	aapt2Flags = strings.Split(m.Output("package-res.apk").Args["flags"], " ")

	unexpectedFlags := "--keep-raw-values"

	if inList(unexpectedFlags, aapt2Flags) {

		t.Errorf("unexpected value, %q is present in aapt2 link flags, %q", unexpectedFlags, aapt2Flags)

	}



	// Check device location.

	path = android.AndroidMkEntriesForTest(t, config, "", m.Module())[0].EntryMap["LOCAL_MODULE_PATH"]

	expectedPath = []string{"/tmp/target/product/test_device/system/overlay"}

	if !reflect.DeepEqual(path, expectedPath) {

		t.Errorf("Unexpected LOCAL_MODULE_PATH value: %v, expected: %v", path, expectedPath)

	}

}

java/java.go

+1 −0
Original line number Diff line number Diff line
@@ -2754,6 +2754,7 @@ func DefaultsFactory() android.Module { 
		&sdkLibraryProperties{},

		&DexImportProperties{},

		&android.ApexProperties{},

		&RuntimeResourceOverlayProperties{},

	)



	android.InitDefaultsModule(module)