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

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

Merge "Include dark greylist entries from annotations." am: 50adb321 am: aa59a907

am: 4d4f8635

Change-Id: I3dc022d9c86481e9086311a0face3d9ad68d700e
parents 33d0507e 4d4f8635
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -351,7 +351,9 @@ $(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): \
	        <(comm -12 <(sort $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE)) \
	                   $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST)) \
	        $(PRIVATE_GREYLIST_INPUTS) \
	    --input-dark-greylists frameworks/base/config/hiddenapi-dark-greylist.txt \
	    --input-dark-greylists \
	        frameworks/base/config/hiddenapi-dark-greylist.txt \
	        $(PRIVATE_DARKGREYLIST_INPUTS) \
	    --input-blacklists frameworks/base/config/hiddenapi-force-blacklist.txt \
	    --output-whitelist $(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST).tmp \
	    --output-light-greylist $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST).tmp \