diff options
| author | 2018-07-13 14:42:49 +0000 | |
|---|---|---|
| committer | 2018-07-13 15:45:54 +0100 | |
| commit | ed1f171cb924e02065da07de27b8021fc0976be7 (patch) | |
| tree | b8480dd0c142ce5cc0212cb8790e5381e41ec7aa | |
| parent | 0babf1815c72a9f3b01eb4d01b1764ec65ba1786 (diff) | |
[DO NOT MERGE] Revert "Build dark greylist from public + light grey API"
This reverts commit 6f6a126b9c64e49abcabcb6ea7b563535d22b04e.
Reason for revert: Bad merge into internal
Change-Id: Iffe5be7c10e8438bd46f71dc22e0867c0d316d40
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | Android.mk | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp index 48757b470f5d..f652349f1bc7 100644 --- a/Android.bp +++ b/Android.bp @@ -1041,7 +1041,6 @@ 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 eddcadae456b..a6566ebc79d6 100644 --- a/Android.mk +++ b/Android.mk @@ -594,7 +594,6 @@ 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) @@ -602,7 +601,6 @@ 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) @@ -675,8 +673,7 @@ $(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)) \ - <(cat $(LOCAL_SRC_PUBLIC_API) $(LOCAL_LIGHT_GREYLIST) | \ - sed 's/\->.*//' | sed 's/\(.*\/\).*/\1/' | sort | uniq | \ + <(sed 's/\->.*//' $(LOCAL_LIGHT_GREYLIST) | sed 's/\(.*\/\).*/\1/' | sort | uniq | \ while read PKG_NAME; do \ grep -E "^$${PKG_NAME}[^/;]*;" $(LOCAL_SRC_PRIVATE_API); \ done | sort | uniq) \ |