Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Push OverlayDeviceTests onto /system"" am: b294b8bc61

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie597d66089a2de256d8817269179c5426bc7d728
This commit is contained in:
Treehugger Robot
2021-01-13 00:23:41 +00:00
committed by Automerger Merge Worker
parent ba88e64636 b294b8bc61
commit c0d6dea0fb
5 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/tests/overlaytests/device/Android.bp
View File

@@ -16,11 +16,7 @@ android_test {
name: "OverlayDeviceTests", name: "OverlayDeviceTests",
srcs: ["src/**/*.java"], srcs: ["src/**/*.java"],
platform_apis: true, platform_apis: true,
certificate: "platform", static_libs: ["androidx.test.rules"],
static_libs: [
"androidx.test.rules",
"testng",
],
test_suites: ["device-tests"], test_suites: ["device-tests"],
data: [ data: [
":OverlayDeviceTests_AppOverlayOne", ":OverlayDeviceTests_AppOverlayOne",

2
core/tests/overlaytests/device/AndroidManifest.xml
View File

@@ -19,8 +19,6 @@
<uses-sdk android:minSdkVersion="21" /> <uses-sdk android:minSdkVersion="21" />
<uses-permission android:name="android.permission.CHANGE_OVERLAY_PACKAGES" />
<application> <application>
<uses-library android:name="android.test.runner"/> <uses-library android:name="android.test.runner"/>
</application> </application>

13
core/tests/overlaytests/device/AndroidTest.xml
View File

@@ -19,20 +19,9 @@
<option name="test-suite-tag" value="apct" /> <option name="test-suite-tag" value="apct" />
<option name="test-suite-tag" value="apct-instrumentation" /> <option name="test-suite-tag" value="apct-instrumentation" />
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="cleanup" value="true" />
<option name="remount-system" value="true" />
<option name="push" value="OverlayDeviceTests.apk->/system/app/OverlayDeviceTests.apk" />
</target_preparer>
<!-- Reboot to have the test APK scanned by PM and reboot after to remove the test APK. -->
<target_preparer class="com.android.tradefed.targetprep.RebootTargetPreparer">
<option name="pre-reboot" value="true" />
<option name="post-reboot" value="true" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup"> <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
<option name="cleanup-apks" value="true" /> <option name="cleanup-apks" value="true" />
<option name="test-file-name" value="OverlayDeviceTests.apk" />
<option name="test-file-name" value="OverlayDeviceTests_AppOverlayOne.apk" /> <option name="test-file-name" value="OverlayDeviceTests_AppOverlayOne.apk" />
<option name="test-file-name" value="OverlayDeviceTests_AppOverlayTwo.apk" /> <option name="test-file-name" value="OverlayDeviceTests_AppOverlayTwo.apk" />
<option name="test-file-name" value="OverlayDeviceTests_FrameworkOverlay.apk" /> <option name="test-file-name" value="OverlayDeviceTests_FrameworkOverlay.apk" />

2
core/tests/overlaytests/device/test-apps/AppOverlayOne/Android.bp
View File

@@ -15,6 +15,6 @@
android_test { android_test {
name: "OverlayDeviceTests_AppOverlayOne", name: "OverlayDeviceTests_AppOverlayOne",
sdk_version: "current", sdk_version: "current",
certificate: "platform",
aaptflags: ["--no-resource-removal"], aaptflags: ["--no-resource-removal"],
} }

2
core/tests/overlaytests/device/test-apps/AppOverlayTwo/Android.bp
View File

@@ -15,6 +15,6 @@
android_test { android_test {
name: "OverlayDeviceTests_AppOverlayTwo", name: "OverlayDeviceTests_AppOverlayTwo",
sdk_version: "current", sdk_version: "current",
certificate: "platform",
aaptflags: ["--no-resource-removal"], aaptflags: ["--no-resource-removal"],
} }