diff options
| -rw-r--r-- | build/apex/Android.bp | 3 | ||||
| -rw-r--r-- | odrefresh/Android.bp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/build/apex/Android.bp b/build/apex/Android.bp index 04ab94343b..504ce92bb0 100644 --- a/build/apex/Android.bp +++ b/build/apex/Android.bp @@ -166,6 +166,8 @@ art_tools_host_only_binaries = [ ] // Core Java libraries. +// This list must be the same as art-bootclasspath-fragment because it's that which is pulled in +// through bootclasspath_fragments below. (com.android.art-device-defaults-minus-odrefresh) libcore_java_libs = [ "core-oj", "core-libart", @@ -262,7 +264,6 @@ apex_defaults { bootclasspath_fragments: ["art-bootclasspath-fragment"], systemserverclasspath_fragments: ["art-systemserverclasspath-fragment"], compat_configs: ["libcore-platform-compat-config"], - java_libs: libcore_java_libs, native_shared_libs: art_runtime_base_native_shared_libs + art_runtime_base_native_device_only_shared_libs + libcore_native_shared_libs, diff --git a/odrefresh/Android.bp b/odrefresh/Android.bp index 9958e3a797..7fe4dc4325 100644 --- a/odrefresh/Android.bp +++ b/odrefresh/Android.bp @@ -122,6 +122,7 @@ art_cc_binary { local_include_dirs: ["include"], header_libs: ["libbase_headers"], srcs: ["odrefresh_broken.cc"], + installable: false, apex_available: ["test_jitzygote_com.android.art"], } |