| commit | d0406316fe4636bc9ee8ee3287931a04ee5ec59b | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Nov 13 22:15:24 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Nov 13 22:15:24 2017 +0000 |
| tree | a244d466d848d9654bde2a4fe22d2504d5d2c723 | |
| parent | c437e14c179c2df426fb711a704d7d39bf8f1b19 [diff] | |
| parent | 24e7a2583632574f8972856c16d556f1121d241c [diff] |
Merge "Fix logcatd dependency in logpersist."
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index f75036d..d4de0ba 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk
@@ -247,7 +247,7 @@ else # if _enforce_vndk_at_runtime is not true LOCAL_MODULE := ld.config.txt -ifeq ($(PRODUCT_FULL_TREBLE)|$(SANITIZE_TARGET),true|) +ifeq ($(PRODUCT_TREBLE_LINKER_NAMESPACES)|$(SANITIZE_TARGET),true|) LOCAL_SRC_FILES := etc/ld.config.txt else LOCAL_SRC_FILES := etc/ld.config.legacy.txt