Merge "Update radio V1_3 and V1_4 Android.bp."
diff --git a/neuralnetworks/V1_1/target/AndroidTest.xml b/neuralnetworks/V1_1/target/AndroidTest.xml
index 2f61869..672c627 100644
--- a/neuralnetworks/V1_1/target/AndroidTest.xml
+++ b/neuralnetworks/V1_1/target/AndroidTest.xml
@@ -25,7 +25,7 @@
<option name="binary-test-source" value="_32bit::DATA/nativetest/VtsHalNeuralnetworksV1_1TargetTest/VtsHalNeuralnetworksV1_1TargetTest"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsHalNeuralnetworksV1_1TargetTest/VtsHalNeuralnetworksV1_1TargetTest"/>
<option name="binary-test-type" value="hal_hidl_gtest"/>
- <option name="test-timeout" value="5m"/>
+ <option name="test-timeout" value="7m"/>
<option name="gtest-batch-mode" value="true"/>
</test>
</configuration>
diff --git a/script/build/build_rule_gen.py b/script/build/build_rule_gen.py
index da80504..14f7da8 100755
--- a/script/build/build_rule_gen.py
+++ b/script/build/build_rule_gen.py
@@ -54,15 +54,17 @@
test_config_dir: string, directory storing the configurations.
Returns:
+ a list of strings where each string contains the path of a checked
+ or updated build file.
True if any file is updated, False otherwise
"""
hal_list = self._vts_spec_parser.HalNamesAndVersions()
- gen_file_paths, updated = self.UpdateHalDirBuildRule(
+ gen_file_paths, updated_file_paths, updated = self.UpdateHalDirBuildRule(
hal_list, test_config_dir)
updated |= utils.RemoveFilesInDirIf(
os.path.join(self._ANDROID_BUILD_TOP, test_config_dir),
lambda x: self._IsAutoGenerated(x) and (x not in gen_file_paths))
- return updated
+ return updated_file_paths, updated
def UpdateHalDirBuildRule(self, hal_list, test_config_dir):
"""Updates build rules for vts drivers/profilers.
@@ -77,11 +79,14 @@
Returns:
a list of strings where each string contains the path of a checked
- or updated build file.
- boolean, True if any file is updated, False otherwise.
+ build file,
+ a list of strings where each string contains the path of an updated
+ build file,
+ boolean, True if any file is updated, False otherwise
"""
- file_paths = []
- updated = False
+ checked_file_paths = []
+ updated_file_paths = []
+ ever_updated = False
for target in hal_list:
hal_name = target[0]
hal_version = target[1]
@@ -91,10 +96,13 @@
utils.HalNameDir(hal_name), utils.HalVerDir(hal_version))
file_path = os.path.join(hal_dir, 'build', 'Android.bp')
- updated |= utils.WriteBuildRule(file_path, self._VtsBuildRuleFromTemplate(
+ updated = utils.WriteBuildRule(file_path, self._VtsBuildRuleFromTemplate(
self._VTS_BUILD_TEMPLATE, hal_name, hal_version))
- file_paths.append(file_path)
- return file_paths, updated
+ checked_file_paths.append(file_path)
+ if updated:
+ updated_file_paths.append(file_path)
+ ever_updated = True
+ return checked_file_paths, updated_file_paths, ever_updated
def _VtsBuildRuleFromTemplate(self, template_path, hal_name, hal_version):
"""Returns build rules in string form by filling out a template.
diff --git a/script/update_makefiles.py b/script/update_makefiles.py
index b3e7fac..c905a24 100755
--- a/script/update_makefiles.py
+++ b/script/update_makefiles.py
@@ -56,10 +56,18 @@
sys.exit(1)
package_name, version = args.hal_package_name.split('@')
hal_list = [(package_name, version)]
- _, updated = build_rule_gen.UpdateHalDirBuildRule(
+ _, updated_files, updated = build_rule_gen.UpdateHalDirBuildRule(
hal_list, Constant.VTS_HAL_TEST_CASE_PATH)
else:
- updated = build_rule_gen.UpdateBuildRule(Constant.VTS_HAL_TEST_CASE_PATH)
+ updated_files, updated = build_rule_gen.UpdateBuildRule(
+ Constant.VTS_HAL_TEST_CASE_PATH)
if updated:
+ print "ERROR: At least one file was not up-to-date and is updated now."
+ print "Please do the following before redoing repo upload ."
+ print "$ cd $ANDROID_BUILD_TOP/test/vts-testcase/hal"
+ for updated_file in updated_files:
+ print "$ git add %s" % updated_file
+ print "$ git commit"
+ print "$ repo upload"
sys.exit(-1)
