commit | 3dbc565d9e167896345ce5245b92f30ebec6bf4f | [log] [tgz] |
---|---|---|
author | Zhi Dou <zhidou@google.com> | Fri Jan 03 14:57:21 2025 -0800 |
committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Fri Jan 03 14:57:21 2025 -0800 |
tree | 3c58817291b80546311f5409892057ad7ab9a7a3 | |
parent | e56edd1c1e7ad4b49f1385db00d4edb7c400705e [diff] |
replace apex name com.google to com Test: atest aconfig_device_paths_java_test Bug: 386211473 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a368bab58a2a84630a3b1a94605b310e4aab8397) Merged-In: Ic342549631d76a43deb5febcc81726792f50a17b Change-Id: Ic342549631d76a43deb5febcc81726792f50a17b
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);
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); } }