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

Merge "Move support library dependency munging earlier"

Browse Source 
am: 7e15b44c23

Change-Id: I9147989ec9226acff81f871461442b689dbfa65d
This commit is contained in:
Colin Cross
2018-05-17 17:23:04 -07:00
committed by android-build-merger
parent 8deac847c3 7e15b44c23
commit 61377fb72a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/package_internal.mk
View File

@@ -89,6 +89,9 @@ endif
include $(BUILD_SYSTEM)/force_aapt2.mk include $(BUILD_SYSTEM)/force_aapt2.mk
# Process Support Library dependencies.
include $(BUILD_SYSTEM)/support_libraries.mk
package_resource_overlays := $(strip \ package_resource_overlays := $(strip \
$(wildcard $(foreach dir, $(PRODUCT_PACKAGE_OVERLAYS), \ $(wildcard $(foreach dir, $(PRODUCT_PACKAGE_OVERLAYS), \
$(addprefix $(dir)/, $(LOCAL_RESOURCE_DIR)))) \ $(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 LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.databinding.library
endif # LOCAL_DATA_BINDING 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 # If the module is a compressed module, we don't pre-opt it because its final
# installation location will be the data partition. # installation location will be the data partition.
ifdef LOCAL_COMPRESSED_MODULE ifdef LOCAL_COMPRESSED_MODULE

6
core/static_java_library.mk
View File

@@ -28,15 +28,15 @@ intermediates.COMMON := $(call local-intermediates-dir,COMMON)
my_res_package := my_res_package :=
# Process Support Library dependencies.
include $(BUILD_SYSTEM)/support_libraries.mk
include $(BUILD_SYSTEM)/force_aapt2.mk include $(BUILD_SYSTEM)/force_aapt2.mk
ifdef LOCAL_AAPT2_ONLY ifdef LOCAL_AAPT2_ONLY
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true
endif endif
# Process Support Library dependencies.
include $(BUILD_SYSTEM)/support_libraries.mk
# Hack to build static Java library with Android resource # Hack to build static Java library with Android resource
# See bug 5714516 # See bug 5714516
all_resources := all_resources :=