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

Commit 49adea3b authored by Colin Cross's avatar Colin Cross
Browse files

Move hiddenapi to Soong 

Perform hiddenapi CSV generation and dex encoding for Soong modules
in Soong.  This fixes an issue where dexpreopting was happening on
a different jar than was being installed.

Bug: 122856783
Test: m checkbuild
Change-Id: I24a235c63ff62fed7e1af9f2fd17e55b0c1598a5
parent 83b7bdf7

core/config.mk

+0 −2
Original line number Diff line number Diff line
@@ -726,8 +726,6 @@ BRILLO_UPDATE_PAYLOAD := $(HOST_OUT_EXECUTABLES)/brillo_update_payload 


DEXDUMP := $(HOST_OUT_EXECUTABLES)/dexdump2$(BUILD_EXECUTABLE_SUFFIX)

PROFMAN := $(HOST_OUT_EXECUTABLES)/profman

HIDDENAPI := $(HOST_OUT_EXECUTABLES)/hiddenapi

CLASS2GREYLIST := $(HOST_OUT_EXECUTABLES)/class2greylist



FINDBUGS_DIR := external/owasp/sanitizer/tools/findbugs/bin

FINDBUGS := $(FINDBUGS_DIR)/findbugs

core/definitions.mk

+0 −23
Original line number Diff line number Diff line
@@ -2714,29 +2714,6 @@ $(INTERNAL_PLATFORM_HIDDENAPI_GREYLIST_METADATA): \ 
endif

endef



# File names for intermediate dex files of `hiddenapi-copy-soong-jar`.

hiddenapi-soong-input-dex = $(dir $(1))/hiddenapi/dex-input/classes.dex

hiddenapi-soong-output-dex = $(dir $(1))/hiddenapi/dex-output/classes.dex



# Decompress a JAR with dex files, invoke $(HIDDENAPI) on them and compress again.

define hiddenapi-copy-soong-jar

$(call hiddenapi-soong-input-dex,$(2)): $(1)

	@rm -rf `dirname $$@`

	@mkdir -p `dirname $$@`

	unzip -o -q $(1) 'classes*.dex' -d `dirname $$@`

	find `dirname $$@` -maxdepth 1 -name 'classes*.dex' | xargs touch



$(call hiddenapi-copy-dex-files,\

    $(call hiddenapi-soong-input-dex,$(2)),\

    $(call hiddenapi-soong-output-dex,$(2)))



$(2): OUTPUT_DIR := $(dir $(call hiddenapi-soong-output-dex,$(2)))

$(2): OUTPUT_JAR := $(dir $(call hiddenapi-soong-output-dex,$(2)))classes.jar

$(2): $(1) $(call hiddenapi-soong-output-dex,$(2)) | $(SOONG_ZIP) $(MERGE_ZIPS)

	$(SOONG_ZIP) -o $${OUTPUT_JAR} -C $${OUTPUT_DIR} -f "$${OUTPUT_DIR}/classes*.dex"

	$(MERGE_ZIPS) -D -zipToNotStrip $${OUTPUT_JAR} -stripFile "classes*.dex" $(2) $${OUTPUT_JAR} $(1)

endef





###########################################################

## Commands to call R8

core/dex_preopt.mk

+10 −2
Original line number Diff line number Diff line
@@ -61,7 +61,10 @@ ifdef PRODUCT_HIDDENAPI_STUBS_TEST 
endif



# Singleton rule which applies $(HIDDENAPI) on all boot class path dex files.

# Inputs are filled with `hiddenapi-copy-dex-files` rules.

# Additional inputs are filled with `hiddenapi-copy-dex-files` rules.

$(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST): $(SOONG_HIDDENAPI_DEX_INPUTS)

$(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST): PRIVATE_DEX_INPUTS := $(SOONG_HIDDENAPI_DEX_INPUTS)



.KATI_RESTAT: \

	$(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST) \

	$(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST)
@@ -83,7 +86,12 @@ $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST): $(HIDDENAPI) $(HIDDENAPI_STUBS) \ 
	$(call commit-change-for-toc,$(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST))

	$(call commit-change-for-toc,$(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST))





# Inputs to singleton rules located in frameworks/base

# Additional inputs are filled with `hiddenapi-generate-csv`

$(INTERNAL_PLATFORM_HIDDENAPI_FLAGS): $(SOONG_HIDDENAPI_FLAGS)

$(INTERNAL_PLATFORM_HIDDENAPI_FLAGS): PRIVATE_FLAGS_INPUTS := $(SOONG_HIDDENAPI_FLAGS)

$(INTERNAL_PLATFORM_HIDDENAPI_GREYLIST_METADATA): $(SOONG_HIDDENAPI_GREYLIST_METADATA)

$(INTERNAL_PLATFORM_HIDDENAPI_GREYLIST_METADATA): PRIVATE_METADATA_INPUTS := $(SOONG_HIDDENAPI_GREYLIST_METADATA)



ifeq ($(PRODUCT_DIST_BOOT_AND_SYSTEM_JARS),true)

boot_profile_jars_zip := $(PRODUCT_OUT)/boot_profile_jars.zip

core/soong_config.mk

+4 −0
Original line number Diff line number Diff line
@@ -152,6 +152,10 @@ $(call add_json_list, ManifestPackageNameOverrides, $(PRODUCT_MANIFEST_PACK 
$(call add_json_bool, EnforceSystemCertificate,          $(ENFORCE_SYSTEM_CERTIFICATE))

$(call add_json_list, EnforceSystemCertificateWhitelist, $(ENFORCE_SYSTEM_CERTIFICATE_WHITELIST))



$(call add_json_str,  HiddenAPIPublicList,               $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST))

$(call add_json_str,  HiddenAPIFlags,                    $(INTERNAL_PLATFORM_HIDDENAPI_FLAGS))

$(call add_json_list, HiddenAPIExtraAppUsageJars,        $(HIDDENAPI_EXTRA_APP_USAGE_JARS))



$(call add_json_map, VendorVars)

$(foreach namespace,$(SOONG_CONFIG_NAMESPACES),\

  $(call add_json_map, $(namespace))\

core/soong_java_prebuilt.mk

+1 −18
Original line number Diff line number Diff line
@@ -79,16 +79,8 @@ endif # LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE 




ifdef LOCAL_SOONG_DEX_JAR

  # Hidden API for boot jars

  ifndef LOCAL_IS_HOST_MODULE

    ifneq ($(filter $(LOCAL_MODULE),$(PRODUCT_BOOT_JARS)),)  # is_boot_jar

      # Derive greylist from classes.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-csv,$(full_classes_jar),$(hiddenapi_flags_csv),$(hiddenapi_metadata_csv)))

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



      ifeq (true,$(WITH_DEXPREOPT))

        # For libart, the boot jars' odex files are replaced by $(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE).

        # We use this installed_odex trick to get boot.art installed.
@@ -99,20 +91,11 @@ ifdef LOCAL_SOONG_DEX_JAR 
        # Make sure to install the .odex and .vdex when you run "make <module_name>"

       $(my_all_targets): $(installed_odex)

      endif

    else # !is_boot_jar

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

    endif # is_boot_jar



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

    $(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(common_javalib.jar)))

    $(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_jar) $(full_classes_header_jar)))



    ifneq ($(filter $(LOCAL_MODULE),$(HIDDENAPI_EXTRA_APP_USAGE_JARS)),)

      # Derive greylist from classes.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-csv,$(full_classes_jar),$(hiddenapi_flags_csv),$(hiddenapi_metadata_csv)))

    endif

  endif



  java-dex : $(LOCAL_BUILT_MODULE)