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

Commit d53050bd authored by David Brazdil's avatar David Brazdil Committed by android-build-merger
Browse files

Merge "Rename hiddenapi config files" 

am: 74167085

Change-Id: I551b6d6b20896b39411575490b000d5a39df4d84
parents 3bfa2ca8 74167085

Android.mk

+4 −6
Original line number Diff line number Diff line
@@ -76,10 +76,9 @@ $(OUT_DOCS)/offline-sdk-timestamp: $(OUT_DOCS)/offline-sdk-docs-docs.zip 
.KATI_RESTAT: $(INTERNAL_PLATFORM_HIDDENAPI_FLAGS)

$(INTERNAL_PLATFORM_HIDDENAPI_FLAGS): \

    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-greylist.txt \

    frameworks/base/config/hiddenapi-greylist-max-p.txt \

    frameworks/base/config/hiddenapi-greylist-max-o.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) \
@@ -88,10 +87,9 @@ $(INTERNAL_PLATFORM_HIDDENAPI_FLAGS): \ 
	    --public $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) \

	    --private $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST) \

	    --csv $(PRIVATE_FLAGS_INPUTS) \

	    --greylist \

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

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

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

	    --greylist-ignore-conflicts $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE) \

	    --greylist-max-p frameworks/base/config/hiddenapi-greylist-max-p.txt \

	    --greylist-max-o-ignore-conflicts \

	        frameworks/base/config/hiddenapi-greylist-max-o.txt \

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

config/hiddenapi-light-greylist.txt→config/hiddenapi-greylist.txt

+249 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.

config/hiddenapi-private-dex.txt

deleted100644 → 0
+0 −141736

File deleted.

Preview size limit exceeded, changes collapsed.

config/hiddenapi-public-dex.txt

deleted100644 → 0
+0 −74841

File deleted.

Preview size limit exceeded, changes collapsed.