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

Commit 3f4136c3 authored by David Brazdil's avatar David Brazdil
Browse files

Make blacklist the default hidden API list 

Starting with DP1 we will move private APIs that have not been
explicitly greylisted into the blacklist. Modify Android.mk to
generate the API lists accordingly.

Bug: 64382372
Test: make, inspect out/target/common/obj/PACKAGING/hiddenapi-*
Change-Id: I1d817ba6b95058ad052a2c7663ef99257bdeffc1
parent c99f5a72

Android.mk

+18 −18
Original line number Diff line number Diff line
@@ -827,35 +827,35 @@ include $(BUILD_STATIC_JAVA_LIBRARY) 


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



# Copy blacklist and light greylist over into the build folder.

# Copy light greylist and dark greylist over into the build folder.

# This is for ART buildbots which need to mock these lists and have alternative

# rules for building them. Other rules in the build system should depend on the

# files in the build folder.



$(eval $(call copy-one-file,frameworks/base/config/hiddenapi-blacklist.txt,\

                            $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)))

$(eval $(call copy-one-file,frameworks/base/config/hiddenapi-light-greylist.txt,\

                            $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST)))



# Generate dark greylist as private API minus (blacklist plus light greylist).



$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST): PRIVATE_API := $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE)

$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST): BLACKLIST := $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)

$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST): LIGHT_GREYLIST := $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST)

$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST): $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE) \

                                              $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST) \

                                              $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST)

	if [ ! -z "`comm -12 <(sort $(BLACKLIST)) <(sort $(LIGHT_GREYLIST))`" ]; then \

		echo "There should be no overlap between $(BLACKLIST) and $(LIGHT_GREYLIST)" 1>&2; \

$(eval $(call copy-one-file,frameworks/base/config/hiddenapi-dark-greylist.txt,\

                            $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST)))



# Generate blacklist as private API minus (light greylist plus dark greylist).



$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST): PRIVATE_API := $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE)

$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST): LIGHT_GREYLIST := $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST)

$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST): DARK_GREYLIST := $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST)

$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST): $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE) \

                                          $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \

                                          $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST)

	if [ ! -z "`comm -12 <(sort $(LIGHT_GREYLIST)) <(sort $(DARK_GREYLIST))`" ]; then \

		echo "There should be no overlap between $(LIGHT_GREYLIST) 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 $(LIGHT_GREYLIST))`" ]; then \

		echo "$(LIGHT_GREYLIST) 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) $(LIGHT_GREYLIST)) > $@

	comm -23 <(sort $(PRIVATE_API)) <(sort $(LIGHT_GREYLIST) $(DARK_GREYLIST)) > $@



# Include subdirectory makefiles

# ============================================================

config/hiddenapi-blacklist.txt

deleted100644 → 0
+0 −0

Empty file deleted.