diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-08-03 13:30:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-03 13:30:17 +0000 |
| commit | 606d3975b23ec725085f8ae16ba4074fd05a556a (patch) | |
| tree | 002f84874ac44ba5a569b6ad39ca4add9daa9e54 /Android.mk | |
| parent | b40b37910d76a0ce9670c95da75d9a8d9f26db06 (diff) | |
| parent | bf7bfc88d89b07ea2a9bc878931df27df8aa7c00 (diff) | |
Merge changes Iaed1cd6b,I681c1e97
* changes:
Revert^2: Greylist com.google.vr.platform hidden methods
Revert^2: Start using new list of non-SDK APIs
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 32d9e9b07fe9..43ff10c5fbfb 100644 --- a/Android.mk +++ b/Android.mk @@ -596,8 +596,8 @@ LOCAL_BLACKLIST := $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST) LOCAL_SRC_GREYLIST := frameworks/base/config/hiddenapi-light-greylist.txt LOCAL_SRC_VENDOR_LIST := frameworks/base/config/hiddenapi-vendor-list.txt LOCAL_SRC_FORCE_BLACKLIST := frameworks/base/config/hiddenapi-force-blacklist.txt -LOCAL_SRC_PUBLIC_API := $(INTERNAL_PLATFORM_DEX_API_FILE) -LOCAL_SRC_PRIVATE_API := $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE) +LOCAL_SRC_PUBLIC_API := $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) +LOCAL_SRC_PRIVATE_API := $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST) LOCAL_SRC_REMOVED_API := $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE) LOCAL_SRC_ALL := \ |