summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2019-04-12 13:11:30 -0700
committerAndreas Gampe <agampe@google.com>2019-04-15 10:27:28 -0700
commit1130892ec7602bb66b1a3ce71942c2c64f62c445 (patch)
treedee05c3ba2cfb6c961f3470c8f49174c1efb17a0
parent6c702ac545ac0d3df6d877f9d316b0ebac290a0f (diff)
PreloadCheck: Add preloaded-classes-blacklist
Embed the preloaded-classes-blacklist file and check all classes in it. Test: atest --test-mapping frameworks/base/tools/preload-check Change-Id: I4292cae1eb24eafe1f63e914143433b57cc74751
-rw-r--r--config/Android.bp18
-rw-r--r--tools/preload-check/Android.bp1
-rw-r--r--tools/preload-check/src/com/android/preload/check/PreloadCheck.java41
3 files changed, 59 insertions, 1 deletions
diff --git a/config/Android.bp b/config/Android.bp
new file mode 100644
index 000000000000..0fb56cb3410a
--- /dev/null
+++ b/config/Android.bp
@@ -0,0 +1,18 @@
+// Copyright (C) 2019 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+filegroup {
+ name: "preloaded-classes-blacklist",
+ srcs: ["preloaded-classes-blacklist"],
+}
diff --git a/tools/preload-check/Android.bp b/tools/preload-check/Android.bp
index c84567b704a6..2488341bfd97 100644
--- a/tools/preload-check/Android.bp
+++ b/tools/preload-check/Android.bp
@@ -15,6 +15,7 @@
java_test_host {
name: "PreloadCheck",
srcs: ["src/**/*.java"],
+ java_resources: [":preloaded-classes-blacklist"],
libs: ["tradefed"],
test_suites: ["general-tests"],
required: ["preload-check-device"],
diff --git a/tools/preload-check/src/com/android/preload/check/PreloadCheck.java b/tools/preload-check/src/com/android/preload/check/PreloadCheck.java
index dbdecdbecd12..1fde40252939 100644
--- a/tools/preload-check/src/com/android/preload/check/PreloadCheck.java
+++ b/tools/preload-check/src/com/android/preload/check/PreloadCheck.java
@@ -25,6 +25,9 @@ import com.android.tradefed.testtype.IDeviceTest;
import org.junit.Test;
import org.junit.runner.RunWith;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+
@RunWith(DeviceJUnit4ClassRunner.class)
public class PreloadCheck implements IDeviceTest {
private ITestDevice mTestDevice;
@@ -65,6 +68,35 @@ public class PreloadCheck implements IDeviceTest {
run("com.android.preload.check.Initialized", "android.animation.Animator");
}
+ /**
+ * Test the classes mentioned in the embedded preloaded-classes blacklist.
+ */
+ @Test
+ public void testBlackList() throws Exception {
+ StringBuilder sb = new StringBuilder();
+ try (BufferedReader br = new BufferedReader(new InputStreamReader(getClass()
+ .getResourceAsStream("/preloaded-classes-blacklist")))) {
+ String s;
+ while ((s = br.readLine()) != null) {
+ s = s.trim();
+ if (s.startsWith("#") || s.isEmpty()) {
+ continue;
+ }
+ try {
+ run("com.android.preload.check.NotInitialized", s);
+ } catch (Throwable t) {
+ if (sb.length() > 0) {
+ sb.append('\n');
+ }
+ sb.append(t.getMessage());
+ }
+ }
+ }
+ if (sb.length() > 0) {
+ throw new RuntimeException(sb.toString());
+ }
+ }
+
private void run(String cmd, String... args) throws Exception {
StringBuilder sb = new StringBuilder();
sb.append("app_process ")
@@ -72,9 +104,16 @@ public class PreloadCheck implements IDeviceTest {
.append(" /system/bin ")
.append(cmd);
for (String arg : args) {
- sb.append(' ').append(arg);
+ sb.append(' ').append(escape(arg));
}
String res = mTestDevice.executeShellCommand(sb.toString());
assertEquals(sb.toString(), "OK", res.trim());
}
+
+ private static String escape(String input) {
+ if (input.indexOf('$') == -1) {
+ return input;
+ }
+ return input.replace("$", "\\$");
+ }
}