commit 68ecbaf614f7a4518357a0ab2b63f98e83778652
author Paul Duffin <paulduffin@google.com> Wed Nov 11 12:53:23 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 11 12:53:23 2020 +0000
tree 282e2363e7ad2702c0eed44f0806d0f3b38d1cff
parent 82d5b6726bf35c0ee0188b60424ccd44e6664287
parent 2d8e1a7e590417f7e96df3df72f45ccdd16dd513

Merge "Switch boot jars package check to using dex jars"

java/hiddenapi_singleton.go

diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go
index bbc8320..1f80e77 100644
--- a/java/hiddenapi_singleton.go
+++ b/java/hiddenapi_singleton.go
@@ -258,6 +258,8 @@
 			ctx, "frameworks/base/config/hiddenapi-max-target-o.txt")).Flag("--ignore-conflicts ").
 		FlagWithInput("--blocked ",
 			android.PathForSource(ctx, "frameworks/base/config/hiddenapi-force-blocked.txt")).
+		FlagWithInput("--blocked ",
+			android.PathForSource(ctx, "frameworks/base/config/hiddenapi-temp-blocklist.txt")).
 		FlagWithInput("--unsupported ", android.PathForSource(
 			ctx, "frameworks/base/config/hiddenapi-unsupported-packages.txt")).Flag("--packages ").
 		FlagWithOutput("--output ", tempPath)