StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix some issues with LOCAL_USES_LIBRARIES"

Browse Source 
am: da187dd390

Change-Id: I8c4674494f982528a37980f2fd87901dec4bcc5a
This commit is contained in:
Mathieu Chartier
2018-05-11 16:10:23 -07:00
committed by android-build-merger
parent 88f9778c34 da187dd390
commit 0453825e7e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/dex_preopt_libart.mk
View File

@@ -175,7 +175,7 @@ class_loader_context=$(PRIVATE_DEX2OAT_CLASS_LOADER_CONTEXT) && \
stored_class_loader_context_arg="" && \ stored_class_loader_context_arg="" && \
uses_library_names="$(PRIVATE_USES_LIBRARY_NAMES)" && \ uses_library_names="$(PRIVATE_USES_LIBRARY_NAMES)" && \
optional_uses_library_names="$(PRIVATE_OPTIONAL_USES_LIBRARY_NAMES)" && \ optional_uses_library_names="$(PRIVATE_OPTIONAL_USES_LIBRARY_NAMES)" && \
$(if $(PRIVATE_ENFORCE_USES_LIBRARIES), \ $(if $(filter true,$(PRIVATE_ENFORCE_USES_LIBRARIES)), \
source build/make/core/verify_uses_libraries.sh "$(1)" && \ source build/make/core/verify_uses_libraries.sh "$(1)" && \
source build/make/core/construct_context.sh "$(PRIVATE_CONDITIONAL_USES_LIBRARIES_HOST)" "$(PRIVATE_CONDITIONAL_USES_LIBRARIES_TARGET)" && \ source build/make/core/construct_context.sh "$(PRIVATE_CONDITIONAL_USES_LIBRARIES_HOST)" "$(PRIVATE_CONDITIONAL_USES_LIBRARIES_TARGET)" && \
,) \ ,) \

4
core/setup_one_odex.mk
View File

@@ -70,7 +70,7 @@ else
# Calculate system build dependencies based on the filtered libraries. # Calculate system build dependencies based on the filtered libraries.
my_intermediate_libs := $(foreach lib_name, $(my_lib_names) $(my_filtered_optional_uses_libraries), \ my_intermediate_libs := $(foreach lib_name, $(my_lib_names) $(my_filtered_optional_uses_libraries), \
$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib_name),,COMMON)/javalib.jar) $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib_name),,)/javalib.jar)
my_dex_preopt_system_dependencies := $(my_intermediate_libs) my_dex_preopt_system_dependencies := $(my_intermediate_libs)
my_dex_preopt_class_loader_context := $(call normalize-path-list,$(my_intermediate_libs)) my_dex_preopt_class_loader_context := $(call normalize-path-list,$(my_intermediate_libs))
@@ -82,7 +82,7 @@ else
my_lib_names := $(patsubst org.apache.http.legacy.boot,org.apache.http.legacy,$(my_lib_names)) my_lib_names := $(patsubst org.apache.http.legacy.boot,org.apache.http.legacy,$(my_lib_names))
my_optional_lib_names := $(patsubst org.apache.http.legacy.boot,org.apache.http.legacy,$(my_optional_lib_names)) my_optional_lib_names := $(patsubst org.apache.http.legacy.boot,org.apache.http.legacy,$(my_optional_lib_names))
ifeq (,$(filter org.apache.http.legacy,$(my_lib_names) $(my_optional_lib_names))) ifeq (,$(filter org.apache.http.legacy,$(my_lib_names) $(my_optional_lib_names)))
my_conditional_uses_libraries_host := $(call intermediates-dir-for,JAVA_LIBRARIES,org.apache.http.legacy.boot,,COMMON)/javalib.jar my_conditional_uses_libraries_host := $(call intermediates-dir-for,JAVA_LIBRARIES,org.apache.http.legacy.boot,,)/javalib.jar
my_conditional_uses_libraries_target := /system/framework/org.apache.http.legacy.boot.jar my_conditional_uses_libraries_target := /system/framework/org.apache.http.legacy.boot.jar
endif endif
endif endif