aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Hair <allenhair@google.com>2019-01-10 11:40:48 -0800
committerAllen Hair <allenhair@google.com>2019-02-01 15:01:23 -0800
commitf16df8685da9e5bdcec7059b93dfe450111445a8 (patch)
tree16f23631b45ef56b7ec3593a3db0ed8a72fb6e5d
parent3274bcfa2ec2f033d2018fe59ec40fa13042d7a1 (diff)
downloadplatform_external_jacoco-f16df8685da9e5bdcec7059b93dfe450111445a8.tar.gz
platform_external_jacoco-f16df8685da9e5bdcec7059b93dfe450111445a8.tar.bz2
platform_external_jacoco-f16df8685da9e5bdcec7059b93dfe450111445a8.zip
Greylist Offline.getProbes(..).
Test: atest -v -it CtsSystemUiTestCases -- --abi x86 --test-arg com.android.tradefed.testtype.AndroidJUnitTest:coverage:true Bug: 122330976 Change-Id: I0b4fe305d69aaa47bb7f5361a14ef8e890ed5120
-rw-r--r--Android.bp6
-rw-r--r--org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Offline.java3
2 files changed, 3 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index e220dcbe..a081a48f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -43,12 +43,6 @@ java_library {
"org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/JmxRegistration.java",
],
- // In order to include Jacoco in core libraries, we cannot depend on
- // anything in the bootclasspath (or we would create dependency cycle).
- // Therefore we compile against the SDK android.jar which gives the same
- // APIs Jacoco depends on.
- sdk_version: "9",
-
// TODO(b/69671801): there's no bytecode on the device, so these shouldn't
// be necessary.
static_libs: [
diff --git a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Offline.java b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Offline.java
index 7eac19fa..b028762e 100644
--- a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Offline.java
+++ b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Offline.java
@@ -11,6 +11,8 @@
*******************************************************************************/
package org.jacoco.agent.rt.internal;
+import android.annotation.UnsupportedAppUsage;
+
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -55,6 +57,7 @@ public final class Offline {
* probe count for this class
* @return probe array instance for this class
*/
+ @UnsupportedAppUsage
public static boolean[] getProbes(final long classid,
final String classname, final int probecount) {
// BEGIN android-change