Rename build target with GameCore instead of GameQualification
am: 9ed971e200
Change-Id: Ibd0fc828d339a76a7b5db321195320619cd819e7
diff --git a/Android.mk b/Android.mk
index 0a5f651..97da40f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,9 +16,9 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-gamecore_dist_host_jar := GameQualificationHelperHost GameQualificationHostTestCases GameQualificationPerformanceTest truth-prebuilt
-gamecore_dist_test_exe := GameQualificationNativeTestCases
-gamecore_dist_test_apk := GameQualificationDevice GameQualificationSampleApp GameQualificationJavaTestCases GameQualificationAllocstress
+gamecore_dist_host_jar := GameCoreHelperHost GameCoreHostTestCases GameCorePerformanceTest truth-prebuilt
+gamecore_dist_test_exe := GameCoreNativeTestCases
+gamecore_dist_test_apk := GameCoreDevice GameCoreSampleApp GameCoreJavaTestCases GameCoreAllocStress
tradefed_jars := tradefed tools-common-prebuilt
tradefed_files := \
@@ -68,7 +68,7 @@
gamecore: $(gamecore_dist_host_jar) $(gamecore_dist_test_apk)
.PHONY: gamecore-test
-gamecore-test: GameQualificationPerformanceTestTest GameQualificationHelperTest
+gamecore-test: GameCorePerformanceTestTest GameCoreHelperTest
.PHONY: gamecore-all
gamecore-all: gamecore gamecore-test
diff --git a/AndroidTest.xml b/AndroidTest.xml
index dfc72ef..e89eec2 100644
--- a/AndroidTest.xml
+++ b/AndroidTest.xml
@@ -7,7 +7,7 @@
<option name="screen-always-on" value="on" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
- <option name="test-file-name" value="GameQualificationDevice.apk" />
+ <option name="test-file-name" value="GameCoreDevice.apk" />
<option name="cleanup-apks" value="true" />
</target_preparer>
<option name="enable-root" value="false" />
@@ -19,7 +19,7 @@
<!-- Java functional tests-->
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
- <option name="test-file-name" value="GameQualificationJavaTestCases.apk" />
+ <option name="test-file-name" value="GameCoreJavaTestCases.apk" />
<option name="cleanup-apks" value="true" />
</target_preparer>
<test class="com.android.tradefed.testtype.InstrumentationTest" >
@@ -27,7 +27,7 @@
</test>
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
- <option name="test-file-name" value="GameQualificationAllocstress.apk" />
+ <option name="test-file-name" value="GameCoreAllocStress.apk" />
<option name="cleanup-apks" value="true" />
</target_preparer>
<test class="com.android.tradefed.testtype.HostTest" >
@@ -37,12 +37,12 @@
<!-- Native functional tests -->
<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
<option name="cleanup" value="true" />
- <option name="push" value="GameQualificationNativeTestCases->/data/local/tmp/GameQualificationNativeTestCases" />
+ <option name="push" value="GameCoreNativeTestCases->/data/local/tmp/GameCoreNativeTestCases" />
<option name="abort-on-push-failure" value="true" />
</target_preparer>
<test class="com.android.tradefed.testtype.GTest">
<option name="native-test-device-path" value="/data/local/tmp" />
- <option name="module-name" value="GameQualificationNativeTestCases" />
+ <option name="module-name" value="GameCoreNativeTestCases" />
</test>
<result_reporter class="com.android.game.qualification.reporter.GameQualificationResultReporter"/>
diff --git a/apps/alloc_stress_app/Android.bp b/apps/alloc_stress_app/Android.bp
index 8237d93..110523d 100644
--- a/apps/alloc_stress_app/Android.bp
+++ b/apps/alloc_stress_app/Android.bp
@@ -22,7 +22,7 @@
}
android_test_helper_app {
- name: "GameQualificationAllocstress",
+ name: "GameCoreAllocStress",
sdk_version: "26", // Oreo
jni_libs: ["libstress"],
test_suites: ["device-tests"],
diff --git a/apps/sample_app/Android.mk b/apps/sample_app/Android.mk
index 6d89f99..b25a33b 100644
--- a/apps/sample_app/Android.mk
+++ b/apps/sample_app/Android.mk
@@ -17,10 +17,10 @@
include $(CLEAR_VARS)
LOCAL_SDK_VERSION := 26 # Oreo
-LOCAL_PACKAGE_NAME := GameQualificationSampleApp
-LOCAL_MODULE_TAGS := tests
+LOCAL_PACKAGE_NAME := GameCoreSampleApp
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
LOCAL_JNI_SHARED_LIBRARIES := libagq libgamecore_sample
-LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_NDK_STL_VARIANT := c++_shared
include $(BUILD_PACKAGE)
diff --git a/dist/certification-tests.xml b/dist/certification-tests.xml
index 27570e9..fa524d1 100644
--- a/dist/certification-tests.xml
+++ b/dist/certification-tests.xml
@@ -10,7 +10,7 @@
<!-- Java functional tests-->
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
- <option name="test-file-name" value="GameQualificationJavaTestCases.apk" />
+ <option name="test-file-name" value="GameCoreJavaTestCases.apk" />
<option name="cleanup-apks" value="true" />
</target_preparer>
<test class="com.android.tradefed.testtype.InstrumentationTest" >
@@ -22,7 +22,7 @@
</test>
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
- <option name="test-file-name" value="GameQualificationAllocstress.apk" />
+ <option name="test-file-name" value="GameCoreAllocStress.apk" />
<option name="cleanup-apks" value="true" />
</target_preparer>
<test class="com.android.tradefed.testtype.HostTest" >
@@ -32,12 +32,12 @@
<!-- Native functional tests -->
<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
<option name="cleanup" value="true" />
- <option name="push" value="GameQualificationNativeTestCases->/data/local/tmp/GameQualificationNativeTestCases" />
+ <option name="push" value="GameCoreNativeTestCases->/data/local/tmp/GameCoreNativeTestCases" />
<option name="abort-on-push-failure" value="true" />
</target_preparer>
<test class="com.android.tradefed.testtype.GTest">
<option name="native-test-device-path" value="/data/local/tmp" />
- <option name="module-name" value="GameQualificationNativeTestCases" />
+ <option name="module-name" value="GameCoreNativeTestCases" />
</test>
<result_reporter class="com.android.game.qualification.reporter.GameQualificationResultReporter"/>
diff --git a/functional_tests/hostside/Android.bp b/functional_tests/hostside/Android.bp
index 9c28ef6..edf2ade 100644
--- a/functional_tests/hostside/Android.bp
+++ b/functional_tests/hostside/Android.bp
@@ -13,7 +13,7 @@
// limitations under the License.
java_test_host {
- name: "GameQualificationHostTestCases",
+ name: "GameCoreHostTestCases",
srcs: ["src/**/*.java"],
libs: [
diff --git a/functional_tests/hostside/AndroidTest.xml b/functional_tests/hostside/AndroidTest.xml
index 8de0911..252072a 100644
--- a/functional_tests/hostside/AndroidTest.xml
+++ b/functional_tests/hostside/AndroidTest.xml
@@ -16,7 +16,7 @@
<option name="test-suite-tag" value="gts" />
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
- <option name="test-file-name" value="GameQualificationAllocstress.apk" />
+ <option name="test-file-name" value="GameCoreAllocStress.apk" />
<option name="cleanup-apks" value="true" />
</target_preparer>
<test class="com.android.tradefed.testtype.HostTest" >
diff --git a/functional_tests/java/Android.mk b/functional_tests/java/Android.mk
index 9881daf..5e7ae7b 100644
--- a/functional_tests/java/Android.mk
+++ b/functional_tests/java/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_PACKAGE_NAME := GameQualificationJavaTestCases
+LOCAL_PACKAGE_NAME := GameCoreJavaTestCases
LOCAL_SDK_VERSION := 26 # Oreo
LOCAL_STATIC_JAVA_LIBRARIES := \
androidx.test.rules \
diff --git a/functional_tests/java/AndroidTest.xml b/functional_tests/java/AndroidTest.xml
index 1a9fad0..d1720bb 100644
--- a/functional_tests/java/AndroidTest.xml
+++ b/functional_tests/java/AndroidTest.xml
@@ -17,7 +17,7 @@
<option name="test-suite-tag" value="gts" />
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
- <option name="test-file-name" value="GameQualificationJavaTestCases.apk" />
+ <option name="test-file-name" value="GameCoreJavaTestCases.apk" />
<option name="cleanup-apks" value="true" />
</target_preparer>
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
diff --git a/functional_tests/native/Android.bp b/functional_tests/native/Android.bp
index 073e418..ae98160 100644
--- a/functional_tests/native/Android.bp
+++ b/functional_tests/native/Android.bp
@@ -16,7 +16,7 @@
cc_test {
sdk_version: "26",
- name: "GameQualificationNativeTestCases",
+ name: "GameCoreNativeTestCases",
srcs: ["cpu_test.cpp", "mprotect_test.cpp", "glExtensions_test.cpp"],
stl: "libc++_static",
shared_libs: [
diff --git a/functional_tests/native/AndroidTest.xml b/functional_tests/native/AndroidTest.xml
index 73b1d6d..00c1eac 100644
--- a/functional_tests/native/AndroidTest.xml
+++ b/functional_tests/native/AndroidTest.xml
@@ -17,13 +17,13 @@
<option name="test-suite-tag" value="gts" />
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="cleanup" value="true" />
- <option name="push" value="GameQualificationNativeTestCases->/data/local/tmp/GameQualificationNativeTestCases" />
+ <option name="push" value="GameCoreNativeTestCases->/data/local/tmp/GameCoreNativeTestCases" />
<option name="append-bitness" value="true" />
<option name="abort-on-push-failure" value="true" />
</target_preparer>
<test class="com.android.tradefed.testtype.GTest">
<option name="native-test-device-path" value="/data/local/tmp" />
- <option name="module-name" value="GameQualificationNativeTestCases" />
+ <option name="module-name" value="GameCoreNativeTestCases" />
</test>
</configuration>
diff --git a/performance_tests/Android.mk b/performance_tests/Android.mk
new file mode 100644
index 0000000..978bbd9
--- /dev/null
+++ b/performance_tests/Android.mk
@@ -0,0 +1,16 @@
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH:= $(call my-dir)
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/performance_tests/deviceside/Android.bp b/performance_tests/deviceside/Android.bp
index e4b15ef..7eb6c77 100644
--- a/performance_tests/deviceside/Android.bp
+++ b/performance_tests/deviceside/Android.bp
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-android_test {
- name: "GameQualificationDevice",
+android_test_helper_app {
+ name: "GameCoreDevice",
sdk_version: "26", // Oreo
manifest: "AndroidManifest.xml",
static_libs: [
"androidx.test.rules",
- "GameQualificationHelper",
+ "GameCoreHelper",
"repackaged.android.test.base",
],
test_suites: ["device-tests"],
diff --git a/performance_tests/helper/Android.bp b/performance_tests/helper/Android.bp
index 79e31ff..5c1e4d5 100644
--- a/performance_tests/helper/Android.bp
+++ b/performance_tests/helper/Android.bp
@@ -13,7 +13,7 @@
// limitations under the License.
java_library {
- name: "GameQualificationHelper",
+ name: "GameCoreHelper",
srcs: [
"src/**/*.java",
"proto/**/*.proto",
@@ -25,7 +25,7 @@
}
java_library_host {
- name: "GameQualificationHelperHost",
+ name: "GameCoreHelperHost",
srcs: [
"src/**/*.java",
"proto/**/*.proto",
@@ -40,13 +40,15 @@
// Test
java_test_host {
- name: "GameQualificationHelperTest",
+ name: "GameCoreHelperTest",
srcs: ["test/**/*.java"],
test_suites: [
"general-tests"
],
libs: [
- "GameQualificationHelperHost",
"junit-host",
],
+ static_libs: [
+ "GameCoreHelperHost",
+ ],
}
diff --git a/performance_tests/helper/TEST_MAPPING b/performance_tests/helper/TEST_MAPPING
index 15b2f97..4ee1351 100644
--- a/performance_tests/helper/TEST_MAPPING
+++ b/performance_tests/helper/TEST_MAPPING
@@ -1,7 +1,7 @@
{
"presubmit": [
{
- "name" : "GameQualificationHelperTest",
+ "name" : "GameCoreHelperTest",
"host" : true
}
]
diff --git a/performance_tests/hostside/Android.bp b/performance_tests/hostside/Android.bp
index a030db8..7ee0d88 100644
--- a/performance_tests/hostside/Android.bp
+++ b/performance_tests/hostside/Android.bp
@@ -13,7 +13,7 @@
// limitations under the License.
java_test_host {
- name: "GameQualificationPerformanceTest",
+ name: "GameCorePerformanceTest",
srcs: ["src/**/*.java"],
java_resource_dirs: ["res"],
@@ -22,14 +22,13 @@
"tradefed",
],
static_libs: [
- "GameQualificationHelperHost",
+ "GameCoreHelperHost",
"truth-prebuilt-host-jar",
"gson-prebuilt-jar",
],
test_suites: [
- "general-tests",
- "vts",
+ "device-tests",
],
}
diff --git a/performance_tests/hostside/AndroidTest.xml b/performance_tests/hostside/AndroidTest.xml
index 04bebe6..6add548 100644
--- a/performance_tests/hostside/AndroidTest.xml
+++ b/performance_tests/hostside/AndroidTest.xml
@@ -2,15 +2,9 @@
<option name="test-suite-tag" value="gamecore" />
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
- <option name="test-file-name" value="GameQualificationDevice.apk" />
+ <option name="test-file-name" value="GameCoreDevice.apk" />
<option name="cleanup-apks" value="true" />
</target_preparer>
<test class="com.android.game.qualification.testtype.GameQualificationHostsideController" />
-
- <!--
- <metrics_collector class="com.android.game.qualification.metric.GameQualificationFpsCollector" />
- <result_reporter class="com.android.game.qualification.reporter.GameQualificationResultReporter"/>
- -->
-
</configuration>
diff --git a/performance_tests/hostside/res/com/android/game/qualification/apk-info.xml b/performance_tests/hostside/res/com/android/game/qualification/apk-info.xml
index 08eb025..58f2cef 100644
--- a/performance_tests/hostside/res/com/android/game/qualification/apk-info.xml
+++ b/performance_tests/hostside/res/com/android/game/qualification/apk-info.xml
@@ -13,7 +13,7 @@
<apk-info>
<apk>
<name>sample</name>
- <fileName>GameQualificationSampleApp.apk</fileName>
+ <fileName>GameCoreSampleApp.apk</fileName>
<packageName>com.android.game.qualification.example</packageName>
<layerName>^com.android.game.qualification.example/android.app.NativeActivity.*#0$</layerName>
<expectIntents>true</expectIntents>
diff --git a/performance_tests/hostside/src/com/android/game/qualification/testtype/GameQualificationHostsideController.java b/performance_tests/hostside/src/com/android/game/qualification/testtype/GameQualificationHostsideController.java
index f597476..71623de 100644
--- a/performance_tests/hostside/src/com/android/game/qualification/testtype/GameQualificationHostsideController.java
+++ b/performance_tests/hostside/src/com/android/game/qualification/testtype/GameQualificationHostsideController.java
@@ -211,6 +211,10 @@
@Override
public void run(ITestInvocationListener listener) throws DeviceNotAvailableException {
+ // Configuration can null if trigger by TEST_MAPPING.
+ if (mConfiguration == null) {
+ return;
+ }
// Find result reporter
if (mResultReporter == null) {
for (ITestInvocationListener testListener
diff --git a/performance_tests/hostside/test/Android.bp b/performance_tests/hostside/test/Android.bp
index 98adbd6..7c9bb31 100644
--- a/performance_tests/hostside/test/Android.bp
+++ b/performance_tests/hostside/test/Android.bp
@@ -13,14 +13,16 @@
// limitations under the License.
java_test_host {
- name: "GameQualificationPerformanceTestTest",
+ name: "GameCorePerformanceTestTest",
srcs: ["**/*.java"],
libs: [
- "GameQualificationPerformanceTest",
- "GameQualificationHelperHost",
"junit-host",
"tradefed",
],
+ static_libs: [
+ "GameCorePerformanceTest",
+ "GameCoreHelperHost",
+ ],
test_suites: ["general-tests"],
installable: false,
}
diff --git a/performance_tests/hostside/test/TEST_MAPPING b/performance_tests/hostside/test/TEST_MAPPING
index 1f7035c..449ba38 100644
--- a/performance_tests/hostside/test/TEST_MAPPING
+++ b/performance_tests/hostside/test/TEST_MAPPING
@@ -1,7 +1,7 @@
{
"presubmit": [
{
- "name" : "GameQualificationPerformanceTestTest",
+ "name" : "GameCorePerformanceTestTest",
"host" : true
}
]
