diff options
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | services/Android.bp | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/compat/CompatConfig.java | 10 |
3 files changed, 4 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp index d136a5dba998..121decbbec50 100644 --- a/Android.bp +++ b/Android.bp @@ -390,7 +390,6 @@ java_library { platform_compat_config { name: "framework-platform-compat-config", - prefix: "framework", src: ":framework-annotation-proc", } diff --git a/services/Android.bp b/services/Android.bp index 27f8d36894da..6953e862f68b 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -63,6 +63,5 @@ cc_library_shared { platform_compat_config { name: "services-platform-compat-config", - prefix: "services", src: ":services", } diff --git a/services/core/java/com/android/server/compat/CompatConfig.java b/services/core/java/com/android/server/compat/CompatConfig.java index 044e41789bb2..027e2fb5ccaa 100644 --- a/services/core/java/com/android/server/compat/CompatConfig.java +++ b/services/core/java/com/android/server/compat/CompatConfig.java @@ -47,11 +47,10 @@ import javax.xml.datatype.DatatypeConfigurationException; public final class CompatConfig { private static final String TAG = "CompatConfig"; - private static final String CONFIG_FILE_SUFFIX = "platform_compat_config.xml"; private static final CompatConfig sInstance = new CompatConfig().initConfigFromLib( Environment.buildPath( - Environment.getRootDirectory(), "etc", "sysconfig")); + Environment.getRootDirectory(), "etc", "compatconfig")); @GuardedBy("mChanges") private final LongSparseArray<CompatChange> mChanges = new LongSparseArray<>(); @@ -212,10 +211,9 @@ public final class CompatConfig { return this; } for (File f : libraryDir.listFiles()) { + Slog.d(TAG, "Found a config file: " + f.getPath()); //TODO(b/138222363): Handle duplicate ids across config files. - if (f.getPath().endsWith(CONFIG_FILE_SUFFIX)) { - readConfig(f); - } + readConfig(f); } return this; } @@ -223,7 +221,7 @@ public final class CompatConfig { private void readConfig(File configFile) { try (InputStream in = new BufferedInputStream(new FileInputStream(configFile))) { for (Change change : XmlParser.read(in).getCompatChange()) { - Slog.w(TAG, "Adding: " + change.toString()); + Slog.d(TAG, "Adding: " + change.toString()); addChange(new CompatChange(change)); } } catch (IOException | DatatypeConfigurationException | XmlPullParserException e) { |