diff options
| author | David Brazdil <dbrazdil@google.com> | 2018-05-11 08:24:12 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-11 08:24:12 -0700 |
| commit | bad3bf6c22998dd0abfc36827bf3996e064612dd (patch) | |
| tree | 50abc1faf2dd0c0ead371700ffec2ba159bd47fe /Android.mk | |
| parent | 0e8fcd37c5d51c643fb928d447290e21a804060f (diff) | |
| parent | f36144f575098d2ff1be8343827fb92d10b9db9b (diff) | |
Merge "Include in hidden API dark greylist based on package name" into pi-dev
am: f36144f575
Change-Id: I2f1e1ccd9de49b95f1c5439b13134cc166645612
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/Android.mk b/Android.mk index 40716a7e5edd..c68eb46ce05d 100644 --- a/Android.mk +++ b/Android.mk @@ -796,21 +796,21 @@ $(LOCAL_LIGHT_GREYLIST): $(LOCAL_SRC_ALL) $(call assert-is-subset,$@,$(LOCAL_SRC_PRIVATE_API)) $(call assert-has-no-overlap,$@,$(LOCAL_SRC_FORCE_BLACKLIST)) -# Generate dark greylist as remaining members of classes on the light greylist, -# as well as the members of their inner classes. +# Generate dark greylist as remaining classes and class members in the same +# package as classes listed in the light greylist. # 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[;$]' +# (2) strip everything after the last forward-slash, +# e.g. 'Lpackage/subpackage/class$inner;' turns into 'Lpackage/subpackage/' +# (3) insert all entries from LOCAL_SRC_PRIVATE_API which begin with the package +# name but do not contain another forward-slash in the class name, e.g. +# matching '^Lpackage/subpackage/[^/;]*;' # (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); \ + <(sed 's/\->.*//' $(LOCAL_LIGHT_GREYLIST) | sed 's/\(.*\/\).*/\1/' | sort | uniq | \ + while read PKG_NAME; do \ + grep -E "^$${PKG_NAME}[^/;]*;" $(LOCAL_SRC_PRIVATE_API); \ done | sort | uniq) \ > $@ $(call assert-is-subset,$@,$(LOCAL_SRC_PRIVATE_API)) @@ -839,4 +839,3 @@ include $(call first-makefiles-under,$(LOCAL_PATH)) endif endif # ANDROID_BUILD_EMBEDDED - |