Merge "Convert appcompat.sh to a Python binary" into main
This commit is contained in:
commit
3dcc84df5c
1 changed files with 4 additions and 8 deletions
|
@ -2925,19 +2925,15 @@ $(hide) \
|
|||
echo "Install path: $(patsubst $(PRODUCT_OUT)/%,%,$(PRIVATE_INSTALLED_MODULE))" >> $(PRODUCT_OUT)/appcompat/$(PRIVATE_MODULE).log && \
|
||||
echo >> $(PRODUCT_OUT)/appcompat/$(PRIVATE_MODULE).log
|
||||
endef
|
||||
ART_VERIDEX_APPCOMPAT_SCRIPT:=$(HOST_OUT)/bin/appcompat.sh
|
||||
ART_VERIDEX_APPCOMPAT:=$(HOST_OUT)/bin/appcompat
|
||||
define run-appcompat
|
||||
$(hide) \
|
||||
echo "appcompat.sh output:" >> $(PRODUCT_OUT)/appcompat/$(PRIVATE_MODULE).log && \
|
||||
PACKAGING=$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING ANDROID_LOG_TAGS="*:e" $(ART_VERIDEX_APPCOMPAT_SCRIPT) --dex-file=$@ --api-flags=$(INTERNAL_PLATFORM_HIDDENAPI_FLAGS) 2>&1 >> $(PRODUCT_OUT)/appcompat/$(PRIVATE_MODULE).log
|
||||
echo "appcompat output:" >> $(PRODUCT_OUT)/appcompat/$(PRIVATE_MODULE).log && \
|
||||
ANDROID_LOG_TAGS="*:e" $(ART_VERIDEX_APPCOMPAT) --dex-file=$@ 2>&1 >> $(PRODUCT_OUT)/appcompat/$(PRIVATE_MODULE).log
|
||||
endef
|
||||
appcompat-files = \
|
||||
$(AAPT2) \
|
||||
$(ART_VERIDEX_APPCOMPAT_SCRIPT) \
|
||||
$(INTERNAL_PLATFORM_HIDDENAPI_FLAGS) \
|
||||
$(HOST_OUT_EXECUTABLES)/veridex \
|
||||
$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/core_dex_intermediates/classes.dex \
|
||||
$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/oahl_dex_intermediates/classes.dex
|
||||
$(ART_VERIDEX_APPCOMPAT) \
|
||||
else
|
||||
appcompat-header =
|
||||
run-appcompat =
|
||||
|
|
Loading…
Reference in a new issue