Merge "Remove libbase dependency of sysprop_library" (9e50e695) · Commits · e / os / android_build_soong

cc/compiler.go

+2 −1

Original line number	Diff line number	Diff line
		@@ -226,7 +226,8 @@ func (compiler *baseCompiler) compilerDeps(ctx DepsContext, deps Deps) Deps {
		}

		if compiler.hasSrcExt(".sysprop") {
		deps.SharedLibs = append(deps.SharedLibs, "libbase")
		deps.HeaderLibs = append(deps.HeaderLibs, "libbase_headers")
		deps.SharedLibs = append(deps.SharedLibs, "liblog")
		}

		if Bool(compiler.Properties.Openmp) {

+0 −10

Original line number	Diff line number	Diff line
		@@ -69,16 +69,6 @@ func GatherRequiredDepsForTest(os android.OsType) string {
		src: "",
		}

		cc_library {
		name: "libbase",
		no_libgcc: true,
		nocrt: true,
		vendor_available: true,
		vndk: {
		enabled: true,
		support_system_process: true,
		}
		}
		cc_library {
		name: "libc",
		no_libgcc: true,

+20 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@ func testContext(config android.Config, bp string,
		})

		ctx.RegisterModuleType("cc_library", android.ModuleFactoryAdaptor(cc.LibraryFactory))
		ctx.RegisterModuleType("cc_library_headers", android.ModuleFactoryAdaptor(cc.LibraryHeaderFactory))
		ctx.RegisterModuleType("cc_library_static", android.ModuleFactoryAdaptor(cc.LibraryFactory))
		ctx.RegisterModuleType("cc_object", android.ModuleFactoryAdaptor(cc.ObjectFactory))
		ctx.RegisterModuleType("llndk_library", android.ModuleFactoryAdaptor(cc.LlndkLibraryFactory))
		@@ -271,6 +272,25 @@ func TestSyspropLibrary(t *testing.T) {
		soc_specific: true,
		static_libs: ["sysprop-platform", "sysprop-vendor"],
		}

		cc_library_headers {
		name: "libbase_headers",
		vendor_available: true,
		recovery_available: true,
		}

		cc_library {
		name: "liblog",
		no_libgcc: true,
		nocrt: true,
		system_shared_libs: [],
		recovery_available: true,
		}

		llndk_library {
		name: "liblog",
		symbol_file: "",
		}
		`)

		for _, variant := range []string{