Skip an async callback function when the UpdateBootFlagsAction object is destroyed am: 347e62aed0
am: 92f188b249
Change-Id: I679048846c2c458b9007ac3c7ce9d7bd8c4e5757
diff --git a/Android.bp b/Android.bp
index 284845d..a72cf50 100644
--- a/Android.bp
+++ b/Android.bp
@@ -293,7 +293,10 @@
],
static_libs: ["libupdate_engine_android"],
- required: ["cacerts_google"],
+ required: [
+ "cacerts_google",
+ "update_engine_payload_key",
+ ],
srcs: ["main.cc"],
init_rc: ["update_engine.rc"],
@@ -366,7 +369,10 @@
},
},
- required: ["android.hardware.boot@1.0-impl-wrapper.recovery"],
+ required: [
+ "android.hardware.boot@1.0-impl-wrapper.recovery",
+ "update_engine_payload_key.recovery",
+ ],
}
// libupdate_engine_client (type: shared_library)
@@ -544,8 +550,6 @@
gtest: false,
stem: "delta_generator",
- relative_install_path: "update_engine_unittests",
- no_named_install_directory: true,
}
// test_http_server (type: executable)
@@ -560,8 +564,6 @@
],
gtest: false,
- relative_install_path: "update_engine_unittests",
- no_named_install_directory: true,
}
// test_subprocess (type: executable)
@@ -573,8 +575,6 @@
srcs: ["test_subprocess.cc"],
gtest: false,
- relative_install_path: "update_engine_unittests",
- no_named_install_directory: true,
}
// Public keys for unittests.
@@ -622,11 +622,6 @@
"libpayload_generator_exports",
"libupdate_engine_android_exports",
],
- required: [
- "test_http_server",
- "test_subprocess",
- "ue_unittest_delta_generator",
- ],
static_libs: [
"libpayload_generator",
@@ -640,6 +635,9 @@
],
data: [
+ ":test_http_server",
+ ":test_subprocess",
+ ":ue_unittest_delta_generator",
":ue_unittest_disk_imgs",
":ue_unittest_keys",
"unittest_key.pem",
@@ -648,6 +646,11 @@
"update_engine.conf",
],
+ // We cannot use the default generated AndroidTest.xml because of the use of helper modules
+ // (i.e. test_http_server, test_subprocess, ue_unittest_delta_generator).
+ test_config: "test_config.xml",
+ test_suites: ["device-tests"],
+
srcs: [
"boot_control_android_unittest.cc",
"certificate_checker_unittest.cc",
diff --git a/test_config.xml b/test_config.xml
new file mode 100644
index 0000000..2639e7f
--- /dev/null
+++ b/test_config.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+<configuration description="Config to run update_engine_unittests on device">
+ <option name="test-suite-tag" value="apct" />
+ <option name="test-suite-tag" value="apct-native" />
+ <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
+ <option name="cleanup" value="true" />
+ <option name="push" value="update_engine_unittests->/data/local/tmp/update_engine_unittests" />
+ </target_preparer>
+
+ <test class="com.android.tradefed.testtype.GTest" >
+ <option name="native-test-device-path" value="/data/local/tmp" />
+ <!-- The following rules avoid test runner from calling the following helper executables
+ directly as gtests. -->
+ <option name="file-exclusion-filter-regex" value=".*/delta_generator$" />
+ <option name="file-exclusion-filter-regex" value=".*/test_http_server$" />
+ <option name="file-exclusion-filter-regex" value=".*/test_subprocess$" />
+ <option name="module-name" value="update_engine_unittests" />
+ </test>
+</configuration>