commit 323cca9a89496b8a6daa85e6715e41961cd02a91
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jan 06 13:40:23 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 06 13:40:23 2025 -0800
tree e36d30f2baf26691c5e4365f612f2be9e1fd656a
parent 0ab4fa1259b608865a8f296399e98105480aef08
parent 3dbc565d9e167896345ce5245b92f30ebec6bf4f

Merge "replace apex name com.google to com" into main

tools/aconfig/aconfig_device_paths/src/DeviceProtosTestUtilTemplate.java

diff --git a/tools/aconfig/aconfig_device_paths/src/DeviceProtosTestUtilTemplate.java b/tools/aconfig/aconfig_device_paths/src/DeviceProtosTestUtilTemplate.java
index 1c5f5f0..2b113df 100644
--- a/tools/aconfig/aconfig_device_paths/src/DeviceProtosTestUtilTemplate.java
+++ b/tools/aconfig/aconfig_device_paths/src/DeviceProtosTestUtilTemplate.java
@@ -84,7 +84,7 @@
                 continue;
             }
 
-            String apexName = prefix.getName();
+            String apexName = prefix.getName().replace("com.google", "com");
             apexName = apexName.substring(0, apexName.length() - 5);
 
             File protoPath = new File(APEX_DIR + apexName + APEX_ACONFIG_PATH_SUFFIX);

tools/aconfig/aconfig_device_paths/test/src/DeviceProtosTestUtilTest.java

diff --git a/tools/aconfig/aconfig_device_paths/test/src/DeviceProtosTestUtilTest.java b/tools/aconfig/aconfig_device_paths/test/src/DeviceProtosTestUtilTest.java
index 8829822..8dd0fd0 100644
--- a/tools/aconfig/aconfig_device_paths/test/src/DeviceProtosTestUtilTest.java
+++ b/tools/aconfig/aconfig_device_paths/test/src/DeviceProtosTestUtilTest.java
@@ -46,7 +46,7 @@
             }
         }
 
-        assertTrue(platformFlags > 0);
-        assertTrue(mainlineFlags > 0);
+        assertTrue(platformFlags > 3);
+        assertTrue(mainlineFlags > 3);
     }
 }