diff options
Diffstat (limited to 'build/apex/art_apex_test.py')
| -rwxr-xr-x | build/apex/art_apex_test.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py index bb974167be..4c090a2ea3 100755 --- a/build/apex/art_apex_test.py +++ b/build/apex/art_apex_test.py @@ -481,7 +481,7 @@ class ReleaseChecker: self._checker.check_native_library('libprofile') self._checker.check_native_library('libsigchain') - # Check java libraries for Managed Core Library. + # Check Java libraries for Managed Core Library. self._checker.check_java_library('apache-xml') self._checker.check_java_library('bouncycastle') self._checker.check_java_library('core-libart') @@ -686,7 +686,7 @@ class TestingTargetChecker: self._checker.check_art_test_executable('art_sigchain_tests') # Check ART test (internal) libraries. - self._checker.check_native_library('libart-gtest') + self._checker.check_native_library('libartd-gtest') self._checker.check_native_library('libartd-simulator-container') # Check ART test tools. @@ -903,7 +903,7 @@ def art_apex_test_main(test_args): for flavor in [ FLAVOR_DEBUG, FLAVOR_TESTING, FLAVOR_RELEASE ]: flavor_tag = flavor # Special handling for the release flavor, whose name is no longer part of the Release ART - # APEX file name (`com.android.art.apex` / `com.android.art`). + # APEX file name (`com.android.art.capex` / `com.android.art`). if flavor == FLAVOR_RELEASE: flavor_tag = '' flavor_pattern = '*.%s*' % flavor_tag @@ -1025,15 +1025,16 @@ def art_apex_test_default(test_parser): # TODO: Add host support. # TODO: Add support for flattened APEX packages. configs = [ - {'name': 'com.android.art', 'flavor': FLAVOR_RELEASE, 'host': False}, - {'name': 'com.android.art.debug', 'flavor': FLAVOR_DEBUG, 'host': False}, - {'name': 'com.android.art.testing', 'flavor': FLAVOR_TESTING, 'host': False}, + {'name': 'com.android.art.capex', 'flavor': FLAVOR_RELEASE, 'host': False}, + {'name': 'com.android.art.debug.capex', 'flavor': FLAVOR_DEBUG, 'host': False}, + # Note: The Testing ART APEX is not a Compressed APEX. + {'name': 'com.android.art.testing.apex', 'flavor': FLAVOR_TESTING, 'host': False}, ] for config in configs: logging.info(config['name']) # TODO: Host will need different path. - test_args.apex = '%s/system/apex/%s.apex' % (product_out, config['name']) + test_args.apex = '%s/system/apex/%s' % (product_out, config['name']) if not os.path.exists(test_args.apex): failed = True logging.error("Cannot find APEX %s. Please build it first.", test_args.apex) |