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

Commit 223dc031 authored by Mathew Inwood's avatar Mathew Inwood Committed by android-build-merger
Browse files

Merge "Support for adding dark greylist members from annotations." am: d72c37eb 

am: ca9374e7

Change-Id: I74b1d31010e807d8474cc3088262b17da5d9c684
parents 95c35a0f ca9374e7

core/definitions.mk

+7 −3
Original line number Diff line number Diff line
@@ -2870,16 +2870,20 @@ endef 
define hiddenapi-generate-greylist-txt

ifneq (,$(wildcard frameworks/base))

# Only generate this target if we're in a tree with frameworks/base present.

$(3): .KATI_IMPLICIT_OUTPUTS := $(2)

$(3): .KATI_IMPLICIT_OUTPUTS := $(2) $(4)

# For now, write P & Q blacklist to single file until runtime support is finished

$(3): $(1) $(CLASS2GREYLIST) $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST)

	$(CLASS2GREYLIST) --public-api-list $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) $(1) \

	    --write-whitelist $(2) --write-greylist $(3)

	    --write-whitelist $(2) \

	    --write-greylist $(3) \

	    --write-greylist 26,28:$(4)



$(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): $(2) $(3)

$(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): $(2) $(3) $(4)

$(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): \

    PRIVATE_WHITELIST_INPUTS := $$(PRIVATE_WHITELIST_INPUTS) $(2)

$(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): \

    PRIVATE_GREYLIST_INPUTS := $$(PRIVATE_GREYLIST_INPUTS) $(3)

    PRIVATE_DARKGREYLIST_INPUTS := $$(PRIVATE_DARKGREYLIST_INPUTS) $(4)

endif

endef

core/java.mk

+3 −2
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ full_classes_stubs_jar := $(intermediates.COMMON)/stubs.jar 
java_source_list_file := $(intermediates.COMMON)/java-source-list

hiddenapi_whitelist_txt := $(intermediates.COMMON)/hiddenapi/whitelist.txt

hiddenapi_greylist_txt := $(intermediates.COMMON)/hiddenapi/greylist.txt

hiddenapi_darkgreylist_txt := $(intermediates.COMMON)/hiddenapi/darkgreylist.txt



ifeq ($(LOCAL_MODULE_CLASS)$(LOCAL_SRC_FILES)$(LOCAL_STATIC_JAVA_LIBRARIES)$(LOCAL_SOURCE_FILES_ALL_GENERATED),APPS)

# If this is an apk without any Java code (e.g. framework-res), we should skip compiling Java.
@@ -503,8 +504,8 @@ ifneq ($(filter $(LOCAL_MODULE),$(PRODUCT_BOOT_JARS)),) # is_boot_jar 
  # dex later on. The difference is academic currently, as we don't proguard any

  # bootclasspath code at the moment. If we were to do that, we should add keep

  # rules for all members with the @UnsupportedAppUsage annotation.

  $(eval $(call hiddenapi-generate-greylist-txt, $(full_classes_pre_proguard_jar),$(hiddenapi_whitelist_txt),$(hiddenapi_greylist_txt)))

  LOCAL_INTERMEDIATE_TARGETS += $(hiddenapi_whitelist_txt) $(hiddenapi_greylist_txt)

  $(eval $(call hiddenapi-generate-greylist-txt, $(full_classes_pre_proguard_jar),$(hiddenapi_whitelist_txt),$(hiddenapi_greylist_txt),$(hiddenapi_darkgreylist_txt)))

  LOCAL_INTERMEDIATE_TARGETS += $(hiddenapi_whitelist_txt) $(hiddenapi_greylist_txt) $(hiddenapi_darkgreylist_txt)

  $(eval $(call hiddenapi-copy-dex-files,$(built_dex_intermediate),$(built_dex_hiddenapi)))

  built_dex_copy_from := $(built_dex_hiddenapi)

else # !is_boot_jar

core/soong_java_prebuilt.mk

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar 
common_javalib.jar := $(intermediates.COMMON)/javalib.jar

hiddenapi_whitelist_txt := $(intermediates.COMMON)/hiddenapi/whitelist.txt

hiddenapi_greylist_txt := $(intermediates.COMMON)/hiddenapi/greylist.txt

hiddenapi_darkgreylist_txt := $(intermediates.COMMON)/hiddenapi/darkgreylist.txt



$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(full_classes_jar)))

$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(full_classes_pre_proguard_jar)))
@@ -78,7 +79,7 @@ ifdef LOCAL_SOONG_DEX_JAR 
        # We use full_classes_jar here, which is the post-proguard jar (on the basis that we also

        # have a full_classes_pre_proguard_jar). This is consistent with the equivalent code in

        # java.mk.

        $(eval $(call hiddenapi-generate-greylist-txt,$(full_classes_jar),$(hiddenapi_whitelist_txt),$(hiddenapi_greylist_txt)))

        $(eval $(call hiddenapi-generate-greylist-txt,$(full_classes_jar),$(hiddenapi_whitelist_txt),$(hiddenapi_greylist_txt),$(hiddenapi_darkgreylist_txt)))

        $(eval $(call hiddenapi-copy-soong-jar,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))

      else # !is_boot_jar

        $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))