From 64937a76ff0cd1af010f23d501a3b6fd4f3dce4d Mon Sep 17 00:00:00 2001 From: Ulya Trafimovich Date: Tue, 22 Jun 2021 00:06:56 -0700 Subject: [PATCH] Disable dexpreopt and check for APKs. This has to be done because the APKs depend on libraries for which there are no modules in the build system, so it's impossible to add a build dependency on them. As a consequence, it is not possible to construct class loader context for dexpreopt. Bug: 132357300 Test: treehugger Change-Id: I2f69ba7b8d11e22496cc27a67733515a5d0f1395 --- self-extractors/qcom/staging/Android.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/self-extractors/qcom/staging/Android.mk b/self-extractors/qcom/staging/Android.mk index 526762f..f95e98f 100644 --- a/self-extractors/qcom/staging/Android.mk +++ b/self-extractors/qcom/staging/Android.mk @@ -15,6 +15,10 @@ LOCAL_MODULE_OWNER := qcom LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk LOCAL_CERTIFICATE := platform +# Disable dexpreopt and check because the APK depends on +# libraries that are not present as modules in the build system. +LOCAL_ENFORCE_USES_LIBRARIES := false +LOCAL_DEX_PREOPT := false include $(BUILD_PREBUILT) include $(CLEAR_VARS) @@ -31,6 +35,10 @@ LOCAL_MODULE_OWNER := qcom LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk LOCAL_CERTIFICATE := platform +# Disable dexpreopt and check because the APK depends on +# libraries that are not present as modules in the build system. +LOCAL_ENFORCE_USES_LIBRARIES := false +LOCAL_DEX_PREOPT := false include $(BUILD_PREBUILT) include $(CLEAR_VARS) @@ -46,5 +54,9 @@ LOCAL_MODULE_OWNER := qcom LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk LOCAL_CERTIFICATE := platform +# Disable dexpreopt and check because the APK depends on +# libraries that are not present as modules in the build system. +LOCAL_ENFORCE_USES_LIBRARIES := false +LOCAL_DEX_PREOPT := false include $(BUILD_PREBUILT) endif