| commit | c437e14c179c2df426fb711a704d7d39bf8f1b19 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Nov 13 21:06:34 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Nov 13 21:06:34 2017 +0000 |
| tree | 31d0ea36473717556a8fb915a82e8c01a6116c2f | |
| parent | 2736aec411a5eeb824d67be45fcf01e07e13b6b1 [diff] | |
| parent | 4e641e3b6a00d62b4e2f67c6c50757389ad11c90 [diff] |
Merge "PRODUCT_TREBLE_LINKER_NAMESPACES for ld.config.txt"
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