Prebuild: Remove --compile-pic and -Xnorelocate.
The --compile-pic argument is obsolete, all generated code is now PIC. The -Xnorelocate is ignored by dex2oat since https://android-review.googlesource.com/771001 where the option was reinterpreted from "use patchoat if needed" to "relocate the boot image in memory if possible" and dex2oat forbids that relocation. Test: Pixel 2 XL boots. Bug: 77856493 Change-Id: I60cdf81267a129be8a482af26fb865110561268e
This commit is contained in:
@@ -199,7 +199,6 @@ ANDROID_LOG_TAGS="*:e" $(DEX2OAT) \
|
||||
--instruction-set=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH) \
|
||||
--instruction-set-variant=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT) \
|
||||
--instruction-set-features=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \
|
||||
--runtime-arg -Xnorelocate --compile-pic \
|
||||
--no-generate-debug-info --generate-build-id \
|
||||
--abort-on-hard-verifier-error \
|
||||
--force-determinism \
|
||||
|
@@ -108,7 +108,6 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE
|
||||
--instruction-set-variant=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT) \
|
||||
--instruction-set-features=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \
|
||||
--android-root=$(PRODUCT_OUT)/system \
|
||||
--runtime-arg -Xnorelocate --compile-pic \
|
||||
--multi-image --no-inline-from=core-oj.jar \
|
||||
--abort-on-hard-verifier-error \
|
||||
--abort-on-soft-verifier-error \
|
||||
|
Reference in New Issue
Block a user