diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-03-28 03:01:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-03-28 03:01:27 +0000 |
| commit | 9e50e6955f8c340444c886033e86b85ed3b2cfde (patch) | |
| tree | 60f7d0faee4bcdd99f002045afcfe49ac8ca7601 /cc | |
| parent | 044ead6b1a8860d5631c0b65569874d2e9860633 (diff) | |
| parent | 1f959769f344182a6741ddcebc7c592d6e521e7e (diff) | |
| download | build_soong-9e50e6955f8c340444c886033e86b85ed3b2cfde.tar.gz build_soong-9e50e6955f8c340444c886033e86b85ed3b2cfde.tar.bz2 build_soong-9e50e6955f8c340444c886033e86b85ed3b2cfde.zip | |
Merge "Remove libbase dependency of sysprop_library"
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/compiler.go | 3 | ||||
| -rw-r--r-- | cc/testing.go | 10 |
2 files changed, 2 insertions, 11 deletions
diff --git a/cc/compiler.go b/cc/compiler.go index 0ab1f018..fe46a3c3 100644 --- a/cc/compiler.go +++ b/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) { diff --git a/cc/testing.go b/cc/testing.go index b3b2756a..2f41de1a 100644 --- a/cc/testing.go +++ b/cc/testing.go @@ -70,16 +70,6 @@ func GatherRequiredDepsForTest(os android.OsType) string { } 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, nocrt: true, |