diff options
| author | 2018-01-25 15:14:58 +0000 | |
|---|---|---|
| committer | 2018-01-25 15:14:58 +0000 | |
| commit | 265863f9d9fdfe501291cfaa6fc0d58f8d38b422 (patch) | |
| tree | f9fbbff62187864d138c967adbc6a090e455159e | |
| parent | d529242eea558fe53aa10643d6c320bb827268b6 (diff) | |
| parent | b6a5c92b507cefc92508593301821faa32f9ea65 (diff) | |
Merge "Create hidden API lists"
am: b6a5c92b50
Change-Id: I176c79560b1cc74182de4cf080b105fc91afce22
| -rw-r--r-- | Android.mk | 22 | ||||
| -rw-r--r-- | config/hiddenapi-blacklist.txt | 0 | ||||
| -rw-r--r-- | config/hiddenapi-dark-greylist.txt | 0 |
3 files changed, 22 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 5dfa81c581a2..0e7c087c939c 100644 --- a/Android.mk +++ b/Android.mk @@ -697,6 +697,28 @@ LOCAL_SRC_FILES := \ include $(BUILD_HOST_JAVA_LIBRARY) +# ==== hiddenapi lists ======================================= + +# Generate light greylist as private API minus (blacklist plus dark greylist). + +$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): PRIVATE_API := $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE) +$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): BLACKLIST := $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST) +$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): DARK_GREYLIST := $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) +$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE) \ + $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST) \ + $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) + if [ ! -z "`comm -12 <(sort $(BLACKLIST)) <(sort $(DARK_GREYLIST))`" ]; then \ + echo "There should be no overlap between $(BLACKLIST) and $(DARK_GREYLIST)" 1>&2; \ + exit 1; \ + elif [ ! -z "`comm -13 <(sort $(PRIVATE_API)) <(sort $(BLACKLIST))`" ]; then \ + echo "$(BLACKLIST) must be a subset of $(PRIVATE_API)" 1>&2; \ + exit 2; \ + elif [ ! -z "`comm -13 <(sort $(PRIVATE_API)) <(sort $(DARK_GREYLIST))`" ]; then \ + echo "$(DARK_GREYLIST) must be a subset of $(PRIVATE_API)" 1>&2; \ + exit 3; \ + fi + comm -23 <(sort $(PRIVATE_API)) <(sort $(BLACKLIST) $(DARK_GREYLIST)) > $@ + # Include subdirectory makefiles # ============================================================ diff --git a/config/hiddenapi-blacklist.txt b/config/hiddenapi-blacklist.txt new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/config/hiddenapi-blacklist.txt diff --git a/config/hiddenapi-dark-greylist.txt b/config/hiddenapi-dark-greylist.txt new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/config/hiddenapi-dark-greylist.txt |