commit | 4a6f7d289a67f1755ddd4ed0fe921b085fc6a84a | [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 | 59556346ffc0377b496cce37e7be22a737479fc7 [diff] | |
parent | 225782ac5818f1528c0205d3ef4019335b3c5f83 [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