Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e15b44c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Move support library dependency munging earlier"

parents 1b02cfd8 7bc6cab1

core/package_internal.mk

+3 −3
Original line number Diff line number Diff line
@@ -89,6 +89,9 @@ endif 


include $(BUILD_SYSTEM)/force_aapt2.mk



# Process Support Library dependencies.

include $(BUILD_SYSTEM)/support_libraries.mk



package_resource_overlays := $(strip \

    $(wildcard $(foreach dir, $(PRODUCT_PACKAGE_OVERLAYS), \

      $(addprefix $(dir)/, $(LOCAL_RESOURCE_DIR)))) \
@@ -316,9 +319,6 @@ LOCAL_RESOURCE_DIR := $(data_binding_res_out) 
LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.databinding.library

endif  # LOCAL_DATA_BINDING



# Process Support Library dependencies.

include $(BUILD_SYSTEM)/support_libraries.mk



# If the module is a compressed module, we don't pre-opt it because its final

# installation location will be the data partition.

ifdef LOCAL_COMPRESSED_MODULE

core/static_java_library.mk

+3 −3
Original line number Diff line number Diff line
@@ -28,15 +28,15 @@ intermediates.COMMON := $(call local-intermediates-dir,COMMON) 


my_res_package :=



# Process Support Library dependencies.

include $(BUILD_SYSTEM)/support_libraries.mk



include $(BUILD_SYSTEM)/force_aapt2.mk



ifdef LOCAL_AAPT2_ONLY

LOCAL_USE_AAPT2 := true

endif



# Process Support Library dependencies.

include $(BUILD_SYSTEM)/support_libraries.mk



# Hack to build static Java library with Android resource

# See bug 5714516

all_resources :=