Merge "Remove libbase dependency of sysprop_library" am: 9e50e6955f am: 93079643a1

am: 918b8ed0b2

Change-Id: If5d70d42b9fe1c320e22950ff98892b6a233b653

cc/compiler.go

@@ -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) {

cc/testing.go

@@ -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,