Removing unnecessary R.java declaration for subpackages, to make gradle setup simpler

Removed:
  com.android.settingslib.restrictedlockutils
  com.android.settingslib.helputils
  com.android.keyguard

Moving sysui settings to use sysui settings resource package name

Test: Everything compiles / presubmit
Bug: 130289146
Change-Id: I5d760fa2f04439d24b455839f7bdd5cc499e840f
This commit is contained in:
Sunny Goyal
2019-08-13 17:39:10 -07:00
parent 77e02da8b3
commit 87fccf0720
53 changed files with 78 additions and 48 deletions

View File

@@ -20,6 +20,8 @@ import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
import libcore.util.SneakyThrow;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
@@ -55,7 +57,11 @@ public class DexmakerShareClassLoaderRule implements TestRule {
* WARNING: This is absolutely incompatible with running tests in parallel!
*/
public static void runWithDexmakerShareClassLoader(Runnable r) {
apply(r::run).run();
try {
apply(r::run).run();
} catch (Throwable t) {
SneakyThrow.sneakyThrow(t);
}
}
/**