Move CtsShimPrebuilt targets to make.
This is a partial revert of Ib6a6592ffd4e2738949025eeaccf6403313fc78c
since soong seems to strip and/or resign
CtsShimPrivUpgrade* targets despite them being marked dex_preopt: false
and presigned:true
Bug: 143472191
Test: android.appsecurity.cts.PrivilegedUpdateTests pass with this
change, without it 3 tests fail, example error:
junit.framework.ComparisonFailure:
expected:<INSTALL_[FAILED_INVALID_APK: New package fails
restrict-update check: com.android.cts.priv.ctsshim]> but
was:<INSTALL_[PARSE_FAILED_NO_CERTIFICATES: Failed to collect
certificates from /data/app/vmdl5202842.tmp/base.apk:
META-INF/CERT.SF indicates /data/app/vmdl5202842.tmp/base.apk is
signed using APK Signature Scheme v2, but no such signature was
found. Signature stripped?]>
Change-Id: Ia73a218e455ddb8c9003de1ffd8fe967ef17329e
2 files changed