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

Commit 142c7408 authored by David Brazdil's avatar David Brazdil Committed by android-build-merger
Browse files

Merge "Support hidden API whitelist generated by class2greylist" 

am: 7c76579e

Change-Id: I2f2a5cf171b9065dcc2ea81cf5282dc59b1fe1ca
parents 7c88a8e0 7c76579e

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -1116,6 +1116,7 @@ endif 


INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi-public-list.txt

INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi-private-list.txt

INTERNAL_PLATFORM_HIDDENAPI_WHITELIST := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi-whitelist.txt

INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi-light-greylist.txt

INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi-dark-greylist.txt

INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi-blacklist.txt

core/definitions.mk

+10 −4
Original line number Diff line number Diff line
@@ -2876,12 +2876,18 @@ endef 
define hiddenapi-generate-greylist-txt

ifneq (,$(wildcard frameworks/base))

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

$(2): $(1) $(CLASS2GREYLIST) $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST)

	$(CLASS2GREYLIST) --public-api-list $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) $(1) > $(2)

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

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

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

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



$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): $(2)

$(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): $(2)

$(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): \

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



$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): $(3)

$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): \

    PRIVATE_GREYLIST_INPUTS := $$(PRIVATE_GREYLIST_INPUTS) $(2)

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

endif

endef

core/java.mk

+4 −4
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ built_dex_intermediate := $(intermediates.COMMON)/dex/classes.dex 
built_dex_hiddenapi := $(intermediates.COMMON)/dex-hiddenapi/classes.dex

full_classes_stubs_jar := $(intermediates.COMMON)/stubs.jar

java_source_list_file := $(intermediates.COMMON)/java-source-list

greylist_txt := $(intermediates.COMMON)/greylist.txt



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

hiddenapi_greylist_txt := $(intermediates.COMMON)/hiddenapi/greylist.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 +503,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),$(greylist_txt)))

  LOCAL_INTERMEDIATE_TARGETS += $(greylist_txt)

  $(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-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

+3 −2
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ full_classes_jar := $(intermediates.COMMON)/classes.jar 
full_classes_pre_proguard_jar := $(intermediates.COMMON)/classes-pre-proguard.jar

full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar

common_javalib.jar := $(intermediates.COMMON)/javalib.jar

greylist_txt := $(intermediates.COMMON)/greylist.txt

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

hiddenapi_greylist_txt := $(intermediates.COMMON)/hiddenapi/greylist.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)))
@@ -77,7 +78,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),$(greylist_txt)))

        $(eval $(call hiddenapi-generate-greylist-txt,$(full_classes_jar),$(hiddenapi_whitelist_txt),$(hiddenapi_greylist_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)))