diff options
author | Nicolas Geoffray | 2018-12-18 08:14:25 -0600 |
---|---|---|
committer | Nicolas Geoffray | 2018-12-18 11:33:02 -0600 |
commit | c04f3126f4fcb87e1465d447ba7457e51552a96e (patch) | |
tree | cc94cb0803ece509aade45ac64d8eeadfb4a2f45 /core/dex_preopt_odex_install.mk | |
parent | 7cac3adf1a285dec02b6d43b9882e958ae41d752 (diff) | |
download | platform-build-c04f3126f4fcb87e1465d447ba7457e51552a96e.tar.gz platform-build-c04f3126f4fcb87e1465d447ba7457e51552a96e.tar.xz platform-build-c04f3126f4fcb87e1465d447ba7457e51552a96e.zip |
Fix build time preopt with shared library uses.
- Handle hidl libraries.
- Handle new shared library encoding.
Test: no mismatch preopt during boot.
bug: 117845483
bug: 111174995
Change-Id: Ie4bca653594c72df2eb2fdd827bc73cfcb76b1d7
Diffstat (limited to 'core/dex_preopt_odex_install.mk')
-rw-r--r-- | core/dex_preopt_odex_install.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index 0d1961910..9f29c689d 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk | |||
@@ -192,7 +192,7 @@ ifdef LOCAL_DEX_PREOPT | |||
192 | $(call add_json_list, OptionalUsesLibraries, $(LOCAL_OPTIONAL_USES_LIBRARIES)) | 192 | $(call add_json_list, OptionalUsesLibraries, $(LOCAL_OPTIONAL_USES_LIBRARIES)) |
193 | $(call add_json_list, UsesLibraries, $(LOCAL_USES_LIBRARIES)) | 193 | $(call add_json_list, UsesLibraries, $(LOCAL_USES_LIBRARIES)) |
194 | $(call add_json_map, LibraryPaths) | 194 | $(call add_json_map, LibraryPaths) |
195 | $(foreach lib,$(sort $(LOCAL_USES_LIBRARIES) $(LOCAL_OPTIONAL_USES_LIBRARIES) org.apache.http.legacy.impl),\ | 195 | $(foreach lib,$(sort $(LOCAL_USES_LIBRARIES) $(LOCAL_OPTIONAL_USES_LIBRARIES) org.apache.http.legacy.impl android.hidl.base-V1.0-java android.hidl.manager-V1.0-java),\ |
196 | $(call add_json_str, $(lib), $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/javalib.jar)) | 196 | $(call add_json_str, $(lib), $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/javalib.jar)) |
197 | $(call end_json_map) | 197 | $(call end_json_map) |
198 | $(call add_json_list, Archs, $(my_dexpreopt_archs)) | 198 | $(call add_json_list, Archs, $(my_dexpreopt_archs)) |
@@ -233,7 +233,7 @@ ifdef LOCAL_DEX_PREOPT | |||
233 | my_dexpreopt_deps := $(my_dex_jar) | 233 | my_dexpreopt_deps := $(my_dex_jar) |
234 | my_dexpreopt_deps += $(if $(my_process_profile),$(LOCAL_DEX_PREOPT_PROFILE)) | 234 | my_dexpreopt_deps += $(if $(my_process_profile),$(LOCAL_DEX_PREOPT_PROFILE)) |
235 | my_dexpreopt_deps += \ | 235 | my_dexpreopt_deps += \ |
236 | $(foreach lib,$(sort $(LOCAL_USES_LIBRARIES) $(LOCAL_OPTIONAL_USES_LIBRARIES) org.apache.http.legacy.impl),\ | 236 | $(foreach lib,$(sort $(LOCAL_USES_LIBRARIES) $(LOCAL_OPTIONAL_USES_LIBRARIES) org.apache.http.legacy.impl android.hidl.base-V1.0-java android.hidl.manager-V1.0-java),\ |
237 | $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/javalib.jar) | 237 | $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/javalib.jar) |
238 | my_dexpreopt_deps += $(LOCAL_DEX_PREOPT_IMAGE_LOCATION) | 238 | my_dexpreopt_deps += $(LOCAL_DEX_PREOPT_IMAGE_LOCATION) |
239 | # TODO: default boot images | 239 | # TODO: default boot images |