diff options
| author | 2016-10-13 13:09:40 +0000 | |
|---|---|---|
| committer | 2016-10-13 13:09:40 +0000 | |
| commit | eeabe6cfbf6f5e80a6be0a72a43a8fb331ace9e2 (patch) | |
| tree | 29feb8c212230f8267313ec0b52159e1d587f202 | |
| parent | 9f82feb9e69556a9b887c3a5c369411807a9c8c8 (diff) | |
| parent | 53502853b0f1b6b253cbcf0f5404f86b8dfff9b1 (diff) | |
Merge "Generate SHA-1 build ID for host-generated *.oat files (2/2)." am: 5ccc874ba1
am: 53502853b0
Change-Id: Ifacc968933106ee99db51f25ca197772859a7a41
| -rw-r--r-- | core/dex_preopt_libart.mk | 3 | ||||
| -rw-r--r-- | core/dex_preopt_libart_boot.mk | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk index ab54b1d8e1..7a0fb958cd 100644 --- a/core/dex_preopt_libart.mk +++ b/core/dex_preopt_libart.mk @@ -104,7 +104,8 @@ $(hide) 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) \ - --include-patch-information --runtime-arg -Xnorelocate --no-generate-debug-info \ + --include-patch-information --runtime-arg -Xnorelocate \ + --no-generate-debug-info --generate-build-id \ --abort-on-hard-verifier-error \ --no-inline-from=core-oj.jar \ $(PRIVATE_DEX_PREOPT_FLAGS) \ diff --git a/core/dex_preopt_libart_boot.mk b/core/dex_preopt_libart_boot.mk index c26b0fc554..5d383a937e 100644 --- a/core/dex_preopt_libart_boot.mk +++ b/core/dex_preopt_libart_boot.mk @@ -71,6 +71,7 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE --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) \ - --android-root=$(PRODUCT_OUT)/system --include-patch-information --runtime-arg -Xnorelocate --no-generate-debug-info \ + --android-root=$(PRODUCT_OUT)/system --include-patch-information --runtime-arg -Xnorelocate \ + --no-generate-debug-info --generate-build-id \ --multi-image --no-inline-from=core-oj.jar \ $(PRODUCT_DEX_PREOPT_BOOT_FLAGS) $(GLOBAL_DEXPREOPT_FLAGS) $(COMPILED_CLASSES_FLAGS) $(ART_BOOT_IMAGE_EXTRA_ARGS) |