Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes If285d71a,Iffe5be7c am: f37950d8c3

Browse Source 
am: c9b5e65747

Change-Id: I047358920ecc478de076c32384390ba856bd8c99
This commit is contained in:
David Brazdil
2018-07-17 03:53:35 -07:00
committed by android-build-merger
parent 548c2c0710 c9b5e65747
commit 3efb177ca6
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -1184,6 +1184,7 @@ droiddoc {
"core/java/overview.html", "core/java/overview.html",
":current-support-api", ":current-support-api",
], ],
dex_api_filename: "public-dex.txt",
private_dex_api_filename: "private-dex.txt", private_dex_api_filename: "private-dex.txt",
removed_dex_api_filename: "removed-dex.txt", removed_dex_api_filename: "removed-dex.txt",
args: framework_docs_args + args: framework_docs_args +

5
Android.mk
View File

@@ -712,6 +712,7 @@ LOCAL_BLACKLIST := $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)
LOCAL_SRC_GREYLIST := frameworks/base/config/hiddenapi-light-greylist.txt LOCAL_SRC_GREYLIST := frameworks/base/config/hiddenapi-light-greylist.txt
LOCAL_SRC_VENDOR_LIST := frameworks/base/config/hiddenapi-vendor-list.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_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_PRIVATE_API := $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE)
LOCAL_SRC_REMOVED_API := $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE) LOCAL_SRC_REMOVED_API := $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE)
@@ -719,6 +720,7 @@ LOCAL_SRC_ALL := \
$(LOCAL_SRC_GREYLIST) \ $(LOCAL_SRC_GREYLIST) \
$(LOCAL_SRC_VENDOR_LIST) \ $(LOCAL_SRC_VENDOR_LIST) \
$(LOCAL_SRC_FORCE_BLACKLIST) \ $(LOCAL_SRC_FORCE_BLACKLIST) \
$(LOCAL_SRC_PUBLIC_API) \
$(LOCAL_SRC_PRIVATE_API) \ $(LOCAL_SRC_PRIVATE_API) \
$(LOCAL_SRC_REMOVED_API) $(LOCAL_SRC_REMOVED_API)
@@ -791,7 +793,8 @@ $(LOCAL_LIGHT_GREYLIST): $(LOCAL_SRC_ALL)
# (4) subtract entries shared with LOCAL_LIGHT_GREYLIST # (4) subtract entries shared with LOCAL_LIGHT_GREYLIST
$(LOCAL_DARK_GREYLIST): $(LOCAL_SRC_ALL) $(LOCAL_LIGHT_GREYLIST) $(LOCAL_DARK_GREYLIST): $(LOCAL_SRC_ALL) $(LOCAL_LIGHT_GREYLIST)
comm -13 <(sort $(LOCAL_LIGHT_GREYLIST) $(LOCAL_SRC_FORCE_BLACKLIST)) \ comm -13 <(sort $(LOCAL_LIGHT_GREYLIST) $(LOCAL_SRC_FORCE_BLACKLIST)) \
<(sed 's/\->.*//' $(LOCAL_LIGHT_GREYLIST) | sed 's/\(.*\/\).*/\1/' | sort | uniq | \ <(cat $(LOCAL_SRC_PUBLIC_API) $(LOCAL_LIGHT_GREYLIST) | \
sed 's/\->.*//' | sed 's/\(.*\/\).*/\1/' | sort | uniq | \
while read PKG_NAME; do \ while read PKG_NAME; do \
grep -E "^$${PKG_NAME}[^/;]*;" $(LOCAL_SRC_PRIVATE_API); \ grep -E "^$${PKG_NAME}[^/;]*;" $(LOCAL_SRC_PRIVATE_API); \
done | sort | uniq) \ done | sort | uniq) \