| commit | 01af80094e9472215e9a5672ffcf1dda9cc43df9 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Jul 12 01:11:10 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 12 01:11:10 2017 +0000 |
| tree | f8dec1a64f24c0db3475c1309e842c9e1158640a | |
| parent | 5a70fe9745175cbec0b4e7d8318f6ddb8fbec45b [diff] | |
| parent | fff6f75fc1de2963254271d7d254e53ae187cada [diff] |
Merge "Use the legacy linker namespace configs when target is sanitized"
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 2e5575f..046557e 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk
@@ -194,7 +194,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := ld.config.txt -ifeq ($(PRODUCT_FULL_TREBLE),true) +ifeq ($(PRODUCT_FULL_TREBLE)|$(SANITIZE_TARGET),true|) LOCAL_SRC_FILES := etc/ld.config.txt else LOCAL_SRC_FILES := etc/ld.config.legacy.txt