Merge "Include in hidden API dark greylist based on package name" (248db482) · Commits · e / os / android_frameworks_base

Android.mk

+10 −11

Original line number	Original line	Diff line number	Diff line
	@@ -661,21 +661,21 @@ $(LOCAL_LIGHT_GREYLIST): $(LOCAL_SRC_ALL)
	$(call assert-is-subset,$@,$(LOCAL_SRC_PRIVATE_API))		$(call assert-is-subset,$@,$(LOCAL_SRC_PRIVATE_API))
	$(call assert-has-no-overlap,$@,$(LOCAL_SRC_FORCE_BLACKLIST))		$(call assert-has-no-overlap,$@,$(LOCAL_SRC_FORCE_BLACKLIST))

	# Generate dark greylist as remaining members of classes on the light greylist,		# Generate dark greylist as remaining classes and class members in the same
	# as well as the members of their inner classes.		# package as classes listed in the light greylist.
	# The algorithm is as follows:		# The algorithm is as follows:
	# (1) extract the class descriptor from each entry in LOCAL_LIGHT_GREYLIST		# (1) extract the class descriptor from each entry in LOCAL_LIGHT_GREYLIST
	# (2) strip the final semicolon and anything after (and including) a dollar sign,		# (2) strip everything after the last forward-slash,
	# e.g. 'Lpackage/class$inner;' turns into 'Lpackage/class'		# e.g. 'Lpackage/subpackage/class$inner;' turns into 'Lpackage/subpackage/'
	# (3) insert all entries from LOCAL_SRC_PRIVATE_API which begin with the stripped		# (3) insert all entries from LOCAL_SRC_PRIVATE_API which begin with the package
	# descriptor followed by a semi-colon or a dollar sign, e.g. matching a regex		# name but do not contain another forward-slash in the class name, e.g.
	# '^Lpackage/class[;$]'		# matching '^Lpackage/subpackage/[^/;]*;'
	# (4) subtract entries shared with LOCAL_LIGHT_GREYLIST		# (4) subtract entries shared with LOCAL_LIGHT_GREYLIST
	$(LOCAL_DARK_GREYLIST): $(LOCAL_SRC_ALL) $(LOCAL_LIGHT_GREYLIST)		$(LOCAL_DARK_GREYLIST): $(LOCAL_SRC_ALL) $(LOCAL_LIGHT_GREYLIST)
	comm -13 <(sort $(LOCAL_LIGHT_GREYLIST) $(LOCAL_SRC_FORCE_BLACKLIST)) \		comm -13 <(sort $(LOCAL_LIGHT_GREYLIST) $(LOCAL_SRC_FORCE_BLACKLIST)) \
	<(sed 's/;\->.//' $(LOCAL_LIGHT_GREYLIST) \| sed 's/$$.//' \| sort \| uniq \| \		<(sed 's/\->.//' $(LOCAL_LIGHT_GREYLIST) \| sed 's/$.\/$.*/\1/' \| sort \| uniq \| \
	while read CLASS_DESC; do \		while read PKG_NAME; do \
	grep -E "^$${CLASS_DESC}[;$$]" $(LOCAL_SRC_PRIVATE_API); \		grep -E "^$${PKG_NAME}[^/;]*;" $(LOCAL_SRC_PRIVATE_API); \
	done \| sort \| uniq) \		done \| sort \| uniq) \
	> $@		> $@
	$(call assert-is-subset,$@,$(LOCAL_SRC_PRIVATE_API))		$(call assert-is-subset,$@,$(LOCAL_SRC_PRIVATE_API))
	@@ -718,4 +718,3 @@ include $(call first-makefiles-under,$(LOCAL_PATH))
	endif		endif

	endif # ANDROID_BUILD_EMBEDDED		endif # ANDROID_BUILD_EMBEDDED

config/hiddenapi-force-blacklist.txt

+36 −0

Original line number	Original line	Diff line number	Diff line
	Ldalvik/system/VMRuntime;->setHiddenApiExemptions([Ljava/lang/String;)V		Ldalvik/system/VMRuntime;->setHiddenApiExemptions([Ljava/lang/String;)V
			Ljava/lang/invoke/VarHandle;->acquireFence()V
			Ljava/lang/invoke/VarHandle;->compareAndExchange([[Ljava/lang/Object;)Ljava/lang/Object;
			Ljava/lang/invoke/VarHandle;->compareAndExchangeAcquire([[Ljava/lang/Object;)Ljava/lang/Object;
			Ljava/lang/invoke/VarHandle;->compareAndExchangeRelease([[Ljava/lang/Object;)Ljava/lang/Object;
			Ljava/lang/invoke/VarHandle;->compareAndSet([[Ljava/lang/Object;)Z
			Ljava/lang/invoke/VarHandle;->fullFence()V
			Ljava/lang/invoke/VarHandle;->get([[Ljava/lang/Object;)Ljava/lang/Object;
			Ljava/lang/invoke/VarHandle;->getAcquire([[Ljava/lang/Object;)Ljava/lang/Object;
			Ljava/lang/invoke/VarHandle;->getAndAdd([[Ljava/lang/Object;)Ljava/lang/Object;
			Ljava/lang/invoke/VarHandle;->getAndAddAcquire([[Ljava/lang/Object;)Ljava/lang/Object;
			Ljava/lang/invoke/VarHandle;->getAndAddRelease([[Ljava/lang/Object;)Ljava/lang/Object;
			Ljava/lang/invoke/VarHandle;->getAndBitwiseAnd([[Ljava/lang/Object;)Ljava/lang/Object;
			Ljava/lang/invoke/VarHandle;->getAndBitwiseAndAcquire([[Ljava/lang/Object;)Ljava/lang/Object;
			Ljava/lang/invoke/VarHandle;->getAndBitwiseAndRelease([[Ljava/lang/Object;)Ljava/lang/Object;
			Ljava/lang/invoke/VarHandle;->getAndBitwiseOr([[Ljava/lang/Object;)Ljava/lang/Object;
			Ljava/lang/invoke/VarHandle;->getAndBitwiseOrAcquire([[Ljava/lang/Object;)Ljava/lang/Object;
			Ljava/lang/invoke/VarHandle;->getAndBitwiseOrRelease([[Ljava/lang/Object;)Ljava/lang/Object;
			Ljava/lang/invoke/VarHandle;->getAndBitwiseXor([[Ljava/lang/Object;)Ljava/lang/Object;
			Ljava/lang/invoke/VarHandle;->getAndBitwiseXorAcquire([[Ljava/lang/Object;)Ljava/lang/Object;
			Ljava/lang/invoke/VarHandle;->getAndBitwiseXorRelease([[Ljava/lang/Object;)Ljava/lang/Object;
			Ljava/lang/invoke/VarHandle;->getAndSet([[Ljava/lang/Object;)Ljava/lang/Object;
			Ljava/lang/invoke/VarHandle;->getAndSetAcquire([[Ljava/lang/Object;)Ljava/lang/Object;
			Ljava/lang/invoke/VarHandle;->getAndSetRelease([[Ljava/lang/Object;)Ljava/lang/Object;
			Ljava/lang/invoke/VarHandle;->getOpaque([[Ljava/lang/Object;)Ljava/lang/Object;
			Ljava/lang/invoke/VarHandle;->getVolatile([[Ljava/lang/Object;)Ljava/lang/Object;
			Ljava/lang/invoke/VarHandle;->loadLoadFence()V
			Ljava/lang/invoke/VarHandle;->releaseFence()V
			Ljava/lang/invoke/VarHandle;->set([[Ljava/lang/Object;)V
			Ljava/lang/invoke/VarHandle;->setOpaque([[Ljava/lang/Object;)V
			Ljava/lang/invoke/VarHandle;->setRelease([[Ljava/lang/Object;)V
			Ljava/lang/invoke/VarHandle;->setVolatile([[Ljava/lang/Object;)V
			Ljava/lang/invoke/VarHandle;->storeStoreFence()V
			Ljava/lang/invoke/VarHandle;->weakCompareAndSet([[Ljava/lang/Object;)Z
			Ljava/lang/invoke/VarHandle;->weakCompareAndSetAcquire([[Ljava/lang/Object;)Z
			Ljava/lang/invoke/VarHandle;->weakCompareAndSetPlain([[Ljava/lang/Object;)Z
			Ljava/lang/invoke/VarHandle;->weakCompareAndSetRelease([[Ljava/lang/Object;)Z