Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I8b20e03c,Id1ef4ab5,Ie34adb8b

Browse Source 
* changes:
  Manualy blacklist certain hidden APIs
  Populate hidden API dark greylist
  Refactor build rules for hidden API lists
This commit is contained in:
David Brazdil
2018-05-09 13:58:50 +00:00
committed by Gerrit Code Review
parent 3a603777ba 259e1629af
commit 6982bf4bde
3 changed files with 94 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
Android.mk
View File

@@ -583,23 +583,67 @@ include $(BUILD_HOST_JAVA_LIBRARY)
# ==== hiddenapi lists ======================================= # ==== hiddenapi lists =======================================
include $(CLEAR_VARS)
# Copy light and dark greylist over into the build folder. # File names of final API lists
# This is for ART buildbots which need to mock these lists and have alternative LOCAL_LIGHT_GREYLIST := $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST)
# rules for building them. Other rules in the build system should depend on the LOCAL_DARK_GREYLIST := $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST)
# files in the build folder. LOCAL_BLACKLIST := $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)
# File names of source files we will use to generate the final API lists.
LOCAL_SRC_GREYLIST := frameworks/base/config/hiddenapi-light-greylist.txt
LOCAL_SRC_VENDOR_LIST := frameworks/base/config/hiddenapi-vendor-list.txt
LOCAL_SRC_FORCE_BLACKLIST := frameworks/base/config/hiddenapi-force-blacklist.txt
LOCAL_SRC_PRIVATE_API := $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE)
LOCAL_SRC_REMOVED_API := $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE)
LOCAL_SRC_ALL := \
$(LOCAL_SRC_GREYLIST) \
$(LOCAL_SRC_VENDOR_LIST) \
$(LOCAL_SRC_FORCE_BLACKLIST) \
$(LOCAL_SRC_PRIVATE_API) \
$(LOCAL_SRC_REMOVED_API)
define assert-has-no-overlap
if [ ! -z "`comm -12 <(sort $(1)) <(sort $(2))`" ]; then \
echo "$(1) and $(2) should not overlap" 1>&2; \
comm -12 <(sort $(1)) <(sort $(2)) 1>&2; \
exit 1; \
fi
endef
define assert-is-subset
if [ ! -z "`comm -23 <(sort $(1)) <(sort $(2))`" ]; then \
echo "$(1) must be a subset of $(2)" 1>&2; \
comm -23 <(sort $(1)) <(sort $(2)) 1>&2; \
exit 1; \
fi
endef
define assert-has-no-duplicates
if [ ! -z "`sort $(1) | uniq -D`" ]; then \
echo "$(1) has duplicate entries" 1>&2; \
sort $(1) | uniq -D 1>&2; \
exit 1; \
fi
endef
# The following rules build API lists in the build folder.
# By not using files from the source tree, ART buildbots can mock these lists
# or have alternative rules for building them. Other rules in the build system
# should depend on the files in the build folder.
# Merge light greylist from multiple files: # Merge light greylist from multiple files:
# (1) manual light greylist # (1) manual greylist LOCAL_SRC_GREYLIST
# (2) list of usages from vendor apps # (2) list of usages from vendor apps LOCAL_SRC_VENDOR_LIST
# (3) list of removed APIs # (3) list of removed APIs in LOCAL_SRC_REMOVED_API
# @removed does not imply private in Doclava. We must take the subset also # @removed does not imply private in Doclava. We must take the subset also
# in PRIVATE_API. # in LOCAL_SRC_PRIVATE_API.
# (4) list of serialization APIs # (4) list of serialization APIs
# Automatically adds all methods which match the signatures in # Automatically adds all methods which match the signatures in
# REGEX_SERIALIZATION. These are greylisted in order to allow applications # REGEX_SERIALIZATION. These are greylisted in order to allow applications
# to write their own serializers. # to write their own serializers.
$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): REGEX_SERIALIZATION := \ $(LOCAL_LIGHT_GREYLIST): REGEX_SERIALIZATION := \
"readObject\(Ljava/io/ObjectInputStream;\)V" \ "readObject\(Ljava/io/ObjectInputStream;\)V" \
"readObjectNoData\(\)V" \ "readObjectNoData\(\)V" \
"readResolve\(\)Ljava/lang/Object;" \ "readResolve\(\)Ljava/lang/Object;" \
@@ -607,43 +651,48 @@ $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): REGEX_SERIALIZATION := \
"serialPersistentFields:\[Ljava/io/ObjectStreamField;" \ "serialPersistentFields:\[Ljava/io/ObjectStreamField;" \
"writeObject\(Ljava/io/ObjectOutputStream;\)V" \ "writeObject\(Ljava/io/ObjectOutputStream;\)V" \
"writeReplace\(\)Ljava/lang/Object;" "writeReplace\(\)Ljava/lang/Object;"
$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): PRIVATE_API := $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE) $(LOCAL_LIGHT_GREYLIST): $(LOCAL_SRC_ALL)
$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): REMOVED_API := $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE) sort $(LOCAL_SRC_GREYLIST) $(LOCAL_SRC_VENDOR_LIST) \
$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): frameworks/base/config/hiddenapi-light-greylist.txt \ <(grep -E "\->("$(subst $(space),"|",$(REGEX_SERIALIZATION))")$$" \
frameworks/base/config/hiddenapi-vendor-list.txt \ $(LOCAL_SRC_PRIVATE_API)) \
$(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE) \ <(comm -12 <(sort $(LOCAL_SRC_REMOVED_API)) <(sort $(LOCAL_SRC_PRIVATE_API))) \
$(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE) > $@
sort frameworks/base/config/hiddenapi-light-greylist.txt \ $(call assert-has-no-duplicates,$@)
frameworks/base/config/hiddenapi-vendor-list.txt \ $(call assert-is-subset,$@,$(LOCAL_SRC_PRIVATE_API))
<(grep -E "\->("$(subst $(space),"|",$(REGEX_SERIALIZATION))")$$" $(PRIVATE_API)) \ $(call assert-has-no-overlap,$@,$(LOCAL_SRC_FORCE_BLACKLIST))
<(comm -12 <(sort $(REMOVED_API)) <(sort $(PRIVATE_API))) \
> $@
$(eval $(call copy-one-file,frameworks/base/config/hiddenapi-dark-greylist.txt,\ # Generate dark greylist as remaining members of classes on the light greylist,
$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST))) # as well as the members of their inner classes.
# The algorithm is as follows:
# (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,
# e.g. 'Lpackage/class$inner;' turns into 'Lpackage/class'
# (3) insert all entries from LOCAL_SRC_PRIVATE_API which begin with the stripped
# descriptor followed by a semi-colon or a dollar sign, e.g. matching a regex
# '^Lpackage/class[;$]'
# (4) subtract entries shared with LOCAL_LIGHT_GREYLIST
$(LOCAL_DARK_GREYLIST): $(LOCAL_SRC_ALL) $(LOCAL_LIGHT_GREYLIST)
comm -13 <(sort $(LOCAL_LIGHT_GREYLIST) $(LOCAL_SRC_FORCE_BLACKLIST)) \
<(sed 's/;\->.*//' $(LOCAL_LIGHT_GREYLIST) | sed 's/$$.*//' | sort | uniq | \
while read CLASS_DESC; do \
grep -E "^$${CLASS_DESC}[;$$]" $(LOCAL_SRC_PRIVATE_API); \
done | sort | uniq) \
> $@
$(call assert-is-subset,$@,$(LOCAL_SRC_PRIVATE_API))
$(call assert-has-no-duplicates,$@)
$(call assert-has-no-overlap,$@,$(LOCAL_LIGHT_GREYLIST))
$(call assert-has-no-overlap,$@,$(LOCAL_SRC_FORCE_BLACKLIST))
# Generate dark greylist as private API minus (blacklist plus light greylist). # Generate blacklist as private API minus (light greylist plus dark greylist).
$(LOCAL_BLACKLIST): $(LOCAL_SRC_ALL) $(LOCAL_LIGHT_GREYLIST) $(LOCAL_DARK_GREYLIST)
$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST): PRIVATE_API := $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE) comm -13 <(sort $(LOCAL_LIGHT_GREYLIST) $(LOCAL_DARK_GREYLIST)) \
$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST): LIGHT_GREYLIST := $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) <(sort $(LOCAL_SRC_PRIVATE_API)) \
$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST): DARK_GREYLIST := $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) > $@
$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST): $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE) \ $(call assert-is-subset,$@,$(LOCAL_SRC_PRIVATE_API))
$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \ $(call assert-has-no-duplicates,$@)
$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) $(call assert-has-no-overlap,$@,$(LOCAL_LIGHT_GREYLIST))
if [ ! -z "`comm -12 <(sort $(LIGHT_GREYLIST)) <(sort $(DARK_GREYLIST))`" ]; then \ $(call assert-has-no-overlap,$@,$(LOCAL_DARK_GREYLIST))
echo "There should be no overlap between $(LIGHT_GREYLIST) and $(DARK_GREYLIST)" 1>&2; \ $(call assert-is-subset,$(LOCAL_SRC_FORCE_BLACKLIST),$@)
comm -12 <(sort $(LIGHT_GREYLIST)) <(sort $(DARK_GREYLIST)) 1>&2; \
exit 1; \
elif [ ! -z "`comm -13 <(sort $(PRIVATE_API)) <(sort $(LIGHT_GREYLIST))`" ]; then \
echo "$(LIGHT_GREYLIST) must be a subset of $(PRIVATE_API)" 1>&2; \
comm -13 <(sort $(PRIVATE_API)) <(sort $(LIGHT_GREYLIST)) 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; \
comm -13 <(sort $(PRIVATE_API)) <(sort $(DARK_GREYLIST)) 1>&2; \
exit 3; \
fi
comm -23 <(sort $(PRIVATE_API)) <(sort $(LIGHT_GREYLIST) $(DARK_GREYLIST)) > $@
# Build AOSP blacklist # Build AOSP blacklist
# ============================================================ # ============================================================

0
config/hiddenapi-dark-greylist.txt
View File

1
config/hiddenapi-force-blacklist.txt Normal file
View File

@@ -0,0 +1 @@
Ldalvik/system/VMRuntime;->setHiddenApiExemptions([Ljava/lang/String;)V