commit 06769c7efbe1ced45e02f6fc69c9dbd63d275ae1
author Victor Hsieh <victorhsieh@google.com> Tue Jan 29 13:03:22 2019 -0800
committer Victor Hsieh <victorhsieh@google.com> Tue Jan 29 13:03:22 2019 -0800
tree c15161d6a3af88d26019238d1ef94edca21e357e
parent c683233b6400bbbb2d983b3d4482ecfe55f55a77

Rename preferCodeIntegrity to useEmbeddedDex

Test: build and run testing apps
Bug: 112037137
Change-Id: Ie8cd8e141df097095310ecc57b6460308210dea5

core/android_manifest.mk

diff --git a/core/android_manifest.mk b/core/android_manifest.mk
index ed759c5..560ed72 100644
--- a/core/android_manifest.mk
+++ b/core/android_manifest.mk
@@ -72,8 +72,8 @@
     my_manifest_fixer_flags += --uses-non-sdk-api
 endif
 
-ifeq (true,$(LOCAL_PREFER_CODE_INTEGRITY))
-    my_manifest_fixer_flags += --prefer-code-integrity
+ifeq (true,$(LOCAL_USE_EMBEDDED_DEX))
+    my_manifest_fixer_flags += --use-embedded-dex
 endif
 
 $(fixed_android_manifest): PRIVATE_MANIFEST_FIXER_FLAGS := $(my_manifest_fixer_flags)