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

Commit 402b9a47 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Convert appcompat.sh to a Python binary" into main am: 3dcc84df am: 200880c0 

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



Change-Id: Ie88312e551afb32262c7de40fddbdaa63ec491b1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 66983022 200880c0

core/definitions.mk

+4 −8
Original line number Diff line number Diff line
@@ -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 =