commit b38ec01fe6e2fb54550a58983081cfd8d23685d9
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Feb 25 14:01:10 2025 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 25 14:01:10 2025 -0800
tree c6a452df5b9d3e76a682326bc8a48c82dafc9956
parent 25224f641ef4bfb655756c85be81b88cc769de48
parent 0905c1885745d93adfb136439cd208e78fd11401

Merge "Filter out framework and ext in uses library tag propagation in make" into main am: ba620cb24e am: 0905c18857

Original change: https://android-review.googlesource.com/c/platform/build/+/3506112

Change-Id: Ia1ee4f1206d63bdfccedc07ab9badb3256210b62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/dex_preopt_odex_install.mk

diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index e7086b7..6fe9d38 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -152,7 +152,7 @@
 # this dexpreopt.config is generated. So it's necessary to add file-level
 # dependencies between dexpreopt.config files.
 my_dexpreopt_dep_configs := $(foreach lib, \
-  $(filter-out $(my_dexpreopt_libs_compat),$(LOCAL_USES_LIBRARIES) $(my_filtered_optional_uses_libraries)), \
+  $(filter-out $(my_dexpreopt_libs_compat) $(FRAMEWORK_LIBRARIES),$(LOCAL_USES_LIBRARIES) $(my_filtered_optional_uses_libraries)), \
   $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,)/dexpreopt.config)
 
 # 1: SDK version