diff options
| author | 2020-09-08 00:27:19 +0000 | |
|---|---|---|
| committer | 2020-09-08 00:27:19 +0000 | |
| commit | 550c65d43f1049d75ace12ccc16ddaaa38ddaa8c (patch) | |
| tree | b03d6c2340dc994dadf3ead54c37fe21d85f532c | |
| parent | e3b9589dcb64bb529bb6e7abe9ce77fb5ae4bf7d (diff) | |
| parent | 5c2914dd610e21e9a4a2bbe5c2e28b29f1cd37d6 (diff) | |
Add extra linker configuration in APEX module am: 5c2914dd61
Original change: https://android-review.googlesource.com/c/platform/art/+/1398972
Change-Id: I82fd3d90437b67879e60f794c685083890f935e0
| -rw-r--r-- | build/apex/Android.bp | 9 | ||||
| -rw-r--r-- | build/apex/linker.config.txt | 17 |
2 files changed, 26 insertions, 0 deletions
diff --git a/build/apex/Android.bp b/build/apex/Android.bp index b1d4446daa..66d7bfda28 100644 --- a/build/apex/Android.bp +++ b/build/apex/Android.bp @@ -216,6 +216,9 @@ apex_defaults { required: [ "com.android.i18n", ], + prebuilts: [ + "art-linker-config", + ], // ART APEXes depend on bouncycastle which is disabled for PDK builds. // Since the dependency is disabled, ART APEXes can't be built either. // Disable the APEXes too. See b/157267166. @@ -454,3 +457,9 @@ cc_prebuilt_binary { defaults: ["art-check-apex-gen-fakebin-defaults"], srcs: [":art-check-testing-apex-gen"], } + +prebuilt_etc { + name: "art-linker-config", + src: "linker.config.txt", + filename: "linker.config.txt", +} diff --git a/build/apex/linker.config.txt b/build/apex/linker.config.txt new file mode 100644 index 0000000000..b960de1a52 --- /dev/null +++ b/build/apex/linker.config.txt @@ -0,0 +1,17 @@ +# Extra linker configurations for ART APEX +# See https://android.googlesource.com/platform/system/linkerconfig/+/master/README.md#apex-linker-configuration + +[permitted_path] +# JVMTI libraries used in ART testing are located under /data; dalvikvm has +# to be able to dlopen them. +# TODO(b/129534335): Move this to the linker configuration of the Test ART +# APEX when it is available. +/data + +# odex files are in /system/framework and /apex/com.android.art/javalib. +# dalvikvm has to be able to dlopen the files for CTS. +/system/framework + +# Primary boot image is loaded through dlopen, so pass the primary boot image +# to the list of paths. +/apex/com.android.art/javalib |