diff options
| author | David Brazdil <dbrazdil@google.com> | 2018-07-17 03:43:13 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-17 03:43:13 -0700 |
| commit | c9b5e657473f6643ecc80586f36740cd503e50f3 (patch) | |
| tree | bc874507bbc85696a80ea26c24f7c2117382a8e2 | |
| parent | dd540c644fc87123cc66bd98212be203d15b3adb (diff) | |
| parent | f37950d8c338968a88c39bb0efab55bc8d487191 (diff) | |
Merge changes If285d71a,Iffe5be7c
am: f37950d8c3
Change-Id: I667c07fa75e0cc5badad3f297fc14316a2acfc42
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | Android.mk | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index b65c30ad643a..e611d109f0ad 100644 --- a/Android.bp +++ b/Android.bp @@ -1166,6 +1166,7 @@ droiddoc { "core/java/overview.html", ":current-support-api", ], + dex_api_filename: "public-dex.txt", private_dex_api_filename: "private-dex.txt", removed_dex_api_filename: "removed-dex.txt", args: framework_docs_args + diff --git a/Android.mk b/Android.mk index c68eb46ce05d..46c1201bf4f8 100644 --- a/Android.mk +++ b/Android.mk @@ -729,6 +729,7 @@ 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_REMOVED_API := $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE) @@ -736,6 +737,7 @@ LOCAL_SRC_ALL := \ $(LOCAL_SRC_GREYLIST) \ $(LOCAL_SRC_VENDOR_LIST) \ $(LOCAL_SRC_FORCE_BLACKLIST) \ + $(LOCAL_SRC_PUBLIC_API) \ $(LOCAL_SRC_PRIVATE_API) \ $(LOCAL_SRC_REMOVED_API) @@ -808,7 +810,8 @@ $(LOCAL_LIGHT_GREYLIST): $(LOCAL_SRC_ALL) # (4) subtract entries shared with LOCAL_LIGHT_GREYLIST $(LOCAL_DARK_GREYLIST): $(LOCAL_SRC_ALL) $(LOCAL_LIGHT_GREYLIST) 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 \ grep -E "^$${PKG_NAME}[^/;]*;" $(LOCAL_SRC_PRIVATE_API); \ done | sort | uniq) \ |