Merge "Don\'t pre-opt shims" into nyc-dev am: 5add5bb77f

am: 39c78d2b8d

* commit '39c78d2b8de19a0d06535de6ca4336f797e318cd':
  Don't pre-opt shims

Change-Id: I76117f2871b1039e0312911520074e0b5e7f59e8
This commit is contained in:
Todd Kennedy
2016-05-03 19:47:34 +00:00
committed by android-build-merger

View File

@@ -29,6 +29,7 @@ LOCAL_MODULE_CLASS := APPS
LOCAL_BUILT_MODULE_STEM := package.apk
# Make sure the build system doesn't try to resign the APK
LOCAL_CERTIFICATE := PRESIGNED
LOCAL_DEX_PREOPT := false
LOCAL_SRC_FILES := CtsShimPriv.apk
@@ -46,6 +47,7 @@ LOCAL_MODULE_CLASS := APPS
LOCAL_BUILT_MODULE_STEM := package.apk
# Make sure the build system doesn't try to resign the APK
LOCAL_CERTIFICATE := PRESIGNED
LOCAL_DEX_PREOPT := false
LOCAL_SRC_FILES := CtsShim.apk