diff options
| author | Mathew Inwood <mathewi@google.com> | 2018-08-06 12:57:57 +0100 |
|---|---|---|
| committer | Mathew Inwood <mathewi@google.com> | 2018-08-06 16:30:26 +0100 |
| commit | 627a84c26a84493ec675360b0aba56cde61e1482 (patch) | |
| tree | 9247f37a455622c1bc159d97e1f858d1b5cee3bd /Android.mk | |
| parent | 4a8c67bbe8569bdda41d4aa6143749f650549dc0 (diff) | |
| parent | 606d3975b23ec725085f8ae16ba4074fd05a556a (diff) | |
resolve merge conflicts of 606d3975b23ec725085f8ae16ba4074fd05a556a to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: Iaed1cd6bc7419597510bfc1ab30a169f75e4ae3f
Merged-In: I681c1e97d0929cfb1d357b2243ecb210d18f9e87
Change-Id: I01782459e2b02f065671da640d675b898b4727fe
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 882f7a3d7a9a..edbb94ddb22a 100644 --- a/Android.mk +++ b/Android.mk @@ -363,8 +363,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 := \ |