put OverlayHostTests files into device-tests and general-tests
OverlayHostTests is only in general-tests.zip. However,
OverlayHostTests_NonPlatformSignatureOverlay.apk,
OverlayHostTests_PlatformSignatureStaticOverlay.apk,
OverlayHostTests_PlatformSignatureOverlay.apk,
OverlayHostTests_UpdateOverlay.apk,
OverlayHostTests_FrameworkOverlayV1.apk,
OverlayHostTests_FrameworkOverlayV2.apk,
OverlayHostTests_AppOverlayV1.apk and
OverlayHostTests_AppOverlayV2.apk are only in device-tests.zip.
All of OverlayHostTest related files should be archived into both
of device-tests.zip and general-tests.zip.
Fixes: 200698485
Test: make general-tests device-tests ; \
assertFiles() { \
unzip -l "$1" | awk \
'$4 ~ /OverlayHostTests.jar$/ { print $4 ; numberOfJar++ } \
$4 ~ /OverlayHostTest.*.apk$/ { print $4 ; numberOfApk++ } \
END { \
if (numberOfApk != 8) { print "Fail for the apk files" } \
if (numberOfJar != 1) { print "Fail for the jar file" } \
}' ;\
} ;\
assertFiles "$ANDROID_PRODUCT_OUT/device-tests.zip" ;\
assertFiles "$ANDROID_PRODUCT_OUT/general-tests.zip"
Change-Id: Ia9020a2b61122b8f71ea8536b2866d52ab1ab2b6
Loading
Please register or sign in to comment