Merge "Emit provideSharedApexLibs to apex-info-list.xml"
diff --git a/apexer/Android.bp b/apexer/Android.bp
index 27fb494..959836a 100644
--- a/apexer/Android.bp
+++ b/apexer/Android.bp
@@ -130,10 +130,6 @@
libs: [
"apex_manifest",
],
- // TODO(b/210142956): re-enable once lab JDK is updated to match platform.
- test_options: {
- unit_test: false,
- },
}
apexer_deps_minus_go_tools = apexer_tools + [
diff --git a/apexer/TEST_MAPPING b/apexer/TEST_MAPPING
index 0ed53e5..1ad3078 100644
--- a/apexer/TEST_MAPPING
+++ b/apexer/TEST_MAPPING
@@ -1,10 +1,9 @@
{
- // TODO(b/210142956): re-enable this once the lab JDK is updated.
- //"presubmit": [
- // {
- // "name": "apexer_test"
- // }
- //],
+ "presubmit": [
+ {
+ "name": "apexer_test"
+ }
+ ],
"imports": [
{
"path": "system/apex/tests"
diff --git a/apexer/apexer_test.py b/apexer/apexer_test.py
index 91053f7..911ef9f 100644
--- a/apexer/apexer_test.py
+++ b/apexer/apexer_test.py
@@ -428,7 +428,7 @@
self._run_build_test(TEST_APEX_WITH_OVERRIDDEN_PACKAGE_NAME)
def test_android_manifest_xml_change(self):
- """Test payload image changes when AndroidManifest.xml changes.
+ """Test payload image changes when AndroidManifest.xml changes.
This is a regression test for b194787885, the issue was that the
AndroidManifest.xml file change does not change payload image and
