Merge "New non-priv prebuilt" into nyc-dev am: 262ff10eb2

am: 52821051d2

* commit '52821051d2b71b72db6fa74e2178284f89495ff1':
  New non-priv prebuilt

Change-Id: Id13ec2393c633d8d6e9ce1038e602102b301abd3
This commit is contained in:
Todd Kennedy
2016-06-06 16:51:58 +00:00
committed by android-build-merger
2 changed files with 2 additions and 0 deletions

Binary file not shown.

View File

@@ -26,6 +26,8 @@ update prebuilts:
cts/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp cts/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp
$ cp out/target/product/shamu/system/priv-app/CtsShimPriv/CtsShimPriv.apk \ $ cp out/target/product/shamu/system/priv-app/CtsShimPriv/CtsShimPriv.apk \
frameworks/base/packages/CtsShim frameworks/base/packages/CtsShim
$ cp out/target/product/shamu/system/app/CtsShim/CtsShim.apk \
frameworks/base/packages/CtsShim
revert manifest: revert manifest:
$ pushd frameworks/base && git checkout -- packages/CtsShim/build/shim_priv/AndroidManifest.xml && popd $ pushd frameworks/base && git checkout -- packages/CtsShim/build/shim_priv/AndroidManifest.xml && popd