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

Commit 98d3da86 authored by Colin Cross's avatar Colin Cross
Browse files

Move hiddenapi rules to Soong 

The hiddenapi rules are now in build/soong/java/hiddenapi_singleton.go.
The dist goals are still here for now.

Bug: 123645297
Test: m checkbuild
Change-Id: Id25b2bf0d6b49be2f908a4613f012773fb1f02c4
parent 0d162221

Android.mk

+0 −28
Original line number Diff line number Diff line
@@ -79,34 +79,6 @@ update-api: doc-comment-check-docs 


# ==== hiddenapi lists =======================================

ifneq ($(UNSAFE_DISABLE_HIDDENAPI_FLAGS),true)

.KATI_RESTAT: $(INTERNAL_PLATFORM_HIDDENAPI_FLAGS)

$(INTERNAL_PLATFORM_HIDDENAPI_FLAGS): \

    PRIVATE_FLAGS_INPUTS := $(PRIVATE_FLAGS_INPUTS) $(SOONG_HIDDENAPI_FLAGS)

$(INTERNAL_PLATFORM_HIDDENAPI_FLAGS): \

    frameworks/base/tools/hiddenapi/generate_hiddenapi_lists.py \

    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-force-blacklist.txt \

    $(INTERNAL_PLATFORM_HIDDENAPI_STUB_FLAGS) \

    $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE) \

    $(SOONG_HIDDENAPI_FLAGS)

	frameworks/base/tools/hiddenapi/generate_hiddenapi_lists.py \

	    --csv $(INTERNAL_PLATFORM_HIDDENAPI_STUB_FLAGS) $(PRIVATE_FLAGS_INPUTS) \

	    --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 \

	    --output $@.tmp

	$(call commit-change-for-toc,$@)



$(INTERNAL_PLATFORM_HIDDENAPI_GREYLIST_METADATA): \

    frameworks/base/tools/hiddenapi/merge_csv.py \

    $(PRIVATE_METADATA_INPUTS)

	frameworks/base/tools/hiddenapi/merge_csv.py $(PRIVATE_METADATA_INPUTS) > $@



$(call dist-for-goals,droidcore,$(INTERNAL_PLATFORM_HIDDENAPI_FLAGS))

$(call dist-for-goals,droidcore,$(INTERNAL_PLATFORM_HIDDENAPI_GREYLIST_METADATA))

endif  # UNSAFE_DISABLE_HIDDENAPI_FLAGS