summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlya Trafimovich <skvadrik@google.com>2021-06-22 00:03:05 -0700
committerXin Li <delphij@google.com>2021-06-22 00:03:05 -0700
commit21aa025bf7aef084f6bad1833d3a0591334d58de (patch)
tree3553495ac14e4d9af5becbec69cc922949ded3fa
parentf36e6e82e177596e9cdcdfc90aa3276a5dbe5401 (diff)
downloadbramble-android-s-beta-4.tar.gz
Disable dexpreopt and <uses-library> check for APKs.android-s-beta-4android-s-beta-3android-s-beta-4
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: I81a4a58b601b3fb496ae7b78eb6abaff20dbf451
-rw-r--r--self-extractors/qcom/staging/Android.mk12
1 files changed, 12 insertions, 0 deletions
diff --git a/self-extractors/qcom/staging/Android.mk b/self-extractors/qcom/staging/Android.mk
index aa9ce88..d09d12e 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 <uses-library> 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 <uses-library> 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 <uses-library> 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