Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0085baa1 authored by Mathew Inwood's avatar Mathew Inwood Committed by android-build-merger
Browse files

Merge "Add new "max-sdk-p blacklist"." am: adbc7dfc am: f0a45a41 

am: 94db5342

Change-Id: Ie0e9cfd4d0f0eff82736741a768f607872589244
parents 80d3529a 94db5342

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ $(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): \ 
    frameworks/base/tools/hiddenapi/generate_hiddenapi_lists.py \

    frameworks/base/config/hiddenapi-light-greylist.txt \

    frameworks/base/config/hiddenapi-vendor-list.txt \

    frameworks/base/config/hiddenapi-max-sdk-p-blacklist.txt \

    frameworks/base/config/hiddenapi-force-blacklist.txt \

    $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) \

    $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST) \
@@ -98,6 +99,7 @@ $(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): \ 
	    --input-greylists \

	        frameworks/base/config/hiddenapi-light-greylist.txt \

	        frameworks/base/config/hiddenapi-vendor-list.txt \

	        frameworks/base/config/hiddenapi-max-sdk-p-blacklist.txt \

	        <(comm -12 <(sort $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE)) \

	                   $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST)) \

	        $(PRIVATE_GREYLIST_INPUTS) \

config/hiddenapi-max-sdk-p-blacklist.txt

0 → 100644
+0 −0

Empty file added.

tools/hiddenapi/sort_api.sh

+3 −1
Original line number Diff line number Diff line
@@ -21,4 +21,6 @@ A=( $(uniq <<< "${A[*]}") ) 
A=( ${C[*]} ${A[*]} )

unset IFS

# Dump array back into the file

if [ ${#A[@]} -neq 0 ]; then

  printf '%s\n' "${A[@]}" > "$dest_list"

fi