Merge "Add new storage deps in forced read-only mode" into main (82e91a60) · Commits · e / os / android_build_soong

aconfig/codegen/cc_aconfig_library.go

+6 −3

Original line number	Diff line number	Diff line
		@@ -88,10 +88,13 @@ func (this *CcAconfigLibraryCallbacks) GeneratorDeps(ctx cc.DepsContext, deps cc
		if mode != "force-read-only" {
		deps.SharedLibs = append(deps.SharedLibs, baseLibDep)

		}

		// TODO: after storage migration is over, don't add these in force-read-only-mode.
		deps.SharedLibs = append(deps.SharedLibs, libAconfigStorageReadApiCcDep)
		deps.SharedLibs = append(deps.SharedLibs, libLogDep)
		deps.SharedLibs = append(deps.SharedLibs, libBaseDep)
		}
		deps.SharedLibs = append(deps.SharedLibs, libLogDep)

		// TODO: It'd be really nice if we could reexport this library and not make everyone do it.

		return deps

+16 −0

Original line number	Diff line number	Diff line
		@@ -249,6 +249,22 @@ func TestForceReadOnly(t *testing.T) {
		aconfig_declarations: "my_aconfig_declarations",
		mode: "force-read-only",
		}


		cc_library {
		name: "libbase",
		srcs: ["libbase.cc"],
		}

		cc_library {
		name: "liblog",
		srcs: ["liblog.cc"],
		}

		cc_library {
		name: "libaconfig_storage_read_api_cc",
		srcs: ["libaconfig_storage_read_api_cc.cc"],
		}
		`))

		module := result.ModuleForTests("my_cc_aconfig_library", "android_arm64_armv8-a_shared").Module()