Merge "Add defaults support to runtime_resource_overlay." into rvc-dev (e3643da7) · Commits · e / os / android_build_soong

java/app_test.go

+59 −0

Original line number	Diff line number	Diff line
		@@ -2540,3 +2540,62 @@ func TestRuntimeResourceOverlay(t *testing.T) {
		t.Errorf("Unexpected LOCAL_OVERRIDES_PACKAGES value: %v, expected: %v", overrides, expectedOverrides)
		}
		}

		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
		@@ -2745,6 +2745,7 @@ func DefaultsFactory() android.Module {
		&sdkLibraryProperties{},
		&DexImportProperties{},
		&android.ApexProperties{},
		&RuntimeResourceOverlayProperties{},
		)

		android.InitDefaultsModule(module)