Merge "Add bootclasspath_fragment." into sc-dev
diff --git a/derive_classpath/derive_classpath.cpp b/derive_classpath/derive_classpath.cpp
index debd913..096172c 100644
--- a/derive_classpath/derive_classpath.cpp
+++ b/derive_classpath/derive_classpath.cpp
@@ -47,7 +47,6 @@
static const std::vector<std::string> kClasspathFragmentGlobPatterns = {
// ART module is a special case and must come first before any other classpath entries.
"/apex/com.android.art/etc/classpaths/*",
- // TODO(b/180105615): put all non /system jars after /apex jars.
"/system/etc/classpaths/*",
"/apex/*/etc/classpaths/*",
};
@@ -135,7 +134,7 @@
return false;
}
for (const Jar& jar : exportedJars.jars()) {
- // TODO(b/180105615): check for duplicate jars and SdkVersion ranges;
+ // TODO(b/180105615): check for SdkVersion ranges;
// TODO(b/180105615): actually make the path relative for apex jars;
classpaths[jar.classpath()].push_back(jar.relative_path());
}