| commit | b7e0ae0c97cfec6b3dcb96c8f4796935d86c26f2 | [log] [tgz] |
|---|---|---|
| author | Martin Stjernholm <mast@google.com> | Mon Feb 24 17:21:56 2020 +0000 |
| committer | Martin Stjernholm <mast@google.com> | Mon Feb 24 17:54:23 2020 +0000 |
| tree | fdad94cbc10697da4902e1f39e5c924be752cb86 | |
| parent | 73cccc439c0c384d5bd83e1eb980f34359a6bb0d [diff] |
Rename ART APEX directory to what it is on device. Preparation to make an InitializeWithApex call in art.cc produce the right paths. Test: system/linkerconfig/rundiff.sh Bug: 147082642 Change-Id: If6116a906dcd0ec983dec8746ab004cb0c835f58
diff --git a/testdata/golden_output/com.android.art/ld.config.txt b/testdata/golden_output/com.android.art/ld.config.txt index 7c49dda..896d3bb 100644 --- a/testdata/golden_output/com.android.art/ld.config.txt +++ b/testdata/golden_output/com.android.art/ld.config.txt
@@ -1,4 +1,4 @@ -dir.com.android.art = /apex/com.android.art.debug/bin +dir.com.android.art = /apex/com.android.art/bin [com.android.art] additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_neuralnetworks,system namespace.default.isolated = true
diff --git a/testdata/root/apex/com.android.art.debug/apex_manifest.json b/testdata/root/apex/com.android.art/apex_manifest.json similarity index 100% rename from testdata/root/apex/com.android.art.debug/apex_manifest.json rename to testdata/root/apex/com.android.art/apex_manifest.json
diff --git a/testdata/root/apex/com.android.art.debug/bin/.keep b/testdata/root/apex/com.android.art/bin/.keep similarity index 100% rename from testdata/root/apex/com.android.art.debug/bin/.keep rename to testdata/root/apex/com.android.art/bin/.keep