summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
author Andrei-Valentin Onea <andreionea@google.com> 2019-04-02 06:47:21 -0700
committer android-build-merger <android-build-merger@google.com> 2019-04-02 06:47:21 -0700
commit78eeaffcfc0411dba9ff604000fad729ab2ea7fe (patch)
tree54027a90ce9121d943a287be6e9b2d101bfe1c55 /java
parentf37f6b064cc776fd024745b85b53660be1b3064c (diff)
parent364388b3a59be1e25eea3962e87496a821d36aef (diff)
Merge "Automatically greylist code in 3P packages" am: dca6ac3e35 am: 595282ced1
am: 364388b3a5 Change-Id: I90eb022de6f2d718e8b2637a4c05dd2859045c67
Diffstat (limited to 'java')
-rw-r--r--java/hiddenapi_singleton.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go
index 86531ebc7..139114b37 100644
--- a/java/hiddenapi_singleton.go
+++ b/java/hiddenapi_singleton.go
@@ -236,6 +236,8 @@ func flagsRule(ctx android.SingletonContext) android.Path {
android.PathForSource(ctx, "frameworks/base/config/hiddenapi-greylist-max-o.txt")).
FlagWithInput("--blacklist ",
android.PathForSource(ctx, "frameworks/base/config/hiddenapi-force-blacklist.txt")).
+ FlagWithInput("--greylist-packages ",
+ android.PathForSource(ctx, "frameworks/base/config/hiddenapi-greylist-packages.txt")).
FlagWithOutput("--output ", tempPath)
commitChangeForRestat(rule, tempPath, outputPath)