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

Commit 6d1ae7a0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Move hiddenapi singleton rules to Soong"

parents 664b72ab 485c9cd4

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -544,6 +544,8 @@ $(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib*/libexpat.so) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product_services)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product_services)



# Clean up old location of hiddenapi files

$(call add-clean-step, rm -f $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi*)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

core/config.mk

+0 −9
Original line number Diff line number Diff line
@@ -206,11 +206,6 @@ else 
JAVA_TMPDIR_ARG :=

endif



# A list of the jars that provide information about usages of the hidden API.

# The core-oj-hiddenapi provides information for the core-oj jar.

HIDDENAPI_EXTRA_APP_USAGE_JARS := \

    core-oj-hiddenapi \



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

# Broken build defaults

# ###############################################################
@@ -1224,10 +1219,6 @@ ifndef INTERNAL_PLATFORM_SYSTEM_PRIVATE_DEX_API_FILE 
INTERNAL_PLATFORM_SYSTEM_PRIVATE_DEX_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/system-private-dex.txt

endif



INTERNAL_PLATFORM_HIDDENAPI_FLAGS := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi-flags.csv

INTERNAL_PLATFORM_HIDDENAPI_STUB_FLAGS := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi-stub-flags.txt

INTERNAL_PLATFORM_HIDDENAPI_GREYLIST_METADATA := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/hiddenapi-greylist.csv



# Missing optional uses-libraries so that the platform doesn't create build rules that depend on

# them. See setup_one_odex.mk.

INTERNAL_PLATFORM_MISSING_USES_LIBRARIES := com.google.android.ble com.google.android.wearable

core/definitions.mk

+0 −52
Original line number Diff line number Diff line
@@ -2664,58 +2664,6 @@ done \ 
fi

endef



# Copy dex files, invoking $(HIDDENAPI) on them in the process.

# Also make the source dex file an input of the hiddenapi singleton rule in dex_preopt.mk.

# Users can set UNSAFE_DISABLE_HIDDENAPI_FLAGS=true to skip this step. This is

# meant to speed up local incremental builds. Note that skipping this step changes

# Java semantics of the result dex bytecode. Use at own risk.

ifneq ($(UNSAFE_DISABLE_HIDDENAPI_FLAGS),true)

define hiddenapi-copy-dex-files

$(2): $(1) $(HIDDENAPI) $(INTERNAL_PLATFORM_HIDDENAPI_FLAGS)

	@rm -rf $(dir $(2))

	@mkdir -p $(dir $(2))

	for INPUT_DEX in `find $(dir $(1)) -maxdepth 1 -name "classes*.dex" | sort`; do \

	    echo "--input-dex=$$$${INPUT_DEX}"; \

	    echo "--output-dex=$(dir $(2))/`basename $$$${INPUT_DEX}`"; \

	done | xargs $(HIDDENAPI) encode --api-flags=$(INTERNAL_PLATFORM_HIDDENAPI_FLAGS)



$(INTERNAL_PLATFORM_HIDDENAPI_STUB_FLAGS): $(1)

$(INTERNAL_PLATFORM_HIDDENAPI_STUB_FLAGS): PRIVATE_DEX_INPUTS := $$(PRIVATE_DEX_INPUTS) $(1)

endef

else  # UNSAFE_DISABLE_HIDDENAPI_FLAGS

define hiddenapi-copy-dex-files

$(2): $(1)

	echo "WARNING: skipping hiddenapi post-processing for $(1)" 1>&2

	@rm -rf $(dir $(2))

	@mkdir -p $(dir $(2))

	find $(dir $(1)) -maxdepth 1 -name "classes*.dex" | xargs -I{} cp -f {} $(dir $(2))/

endef

endif  # UNSAFE_DISABLE_HIDDENAPI_FLAGS



# Generate a greylist.txt from a classes.jar

define hiddenapi-generate-csv

ifneq ($(UNSAFE_DISABLE_HIDDENAPI_FLAGS),true)

ifneq (,$(wildcard frameworks/base))

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

$(2): $(1) $(CLASS2GREYLIST) $(INTERNAL_PLATFORM_HIDDENAPI_STUB_FLAGS)

	$(CLASS2GREYLIST) --stub-api-flags $(INTERNAL_PLATFORM_HIDDENAPI_STUB_FLAGS) $(1) \

	    --write-flags-csv $(2)



$(3): $(1) $(CLASS2GREYLIST) $(INTERNAL_PLATFORM_HIDDENAPI_STUB_FLAGS)

	$(CLASS2GREYLIST) --stub-api-flags $(INTERNAL_PLATFORM_HIDDENAPI_STUB_FLAGS) $(1) \

	    --write-metadata-csv $(3)



$(INTERNAL_PLATFORM_HIDDENAPI_FLAGS): $(2)

$(INTERNAL_PLATFORM_HIDDENAPI_FLAGS): PRIVATE_FLAGS_INPUTS := $$(PRIVATE_FLAGS_INPUTS) $(2)



$(INTERNAL_PLATFORM_HIDDENAPI_GREYLIST_METADATA): $(3)

$(INTERNAL_PLATFORM_HIDDENAPI_GREYLIST_METADATA): \

    PRIVATE_METADATA_INPUTS := $$(PRIVATE_METADATA_INPUTS) $(3)



endif

endif  # UNSAFE_DISABLE_HIDDENAPI_FLAGS

endef





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

## Commands to call R8

core/dex_preopt.mk

+0 −61
Original line number Diff line number Diff line
@@ -30,67 +30,6 @@ $(foreach b,$(DEXPREOPT_BOOT_JARS_MODULES),$(eval $(call _dexpreopt-boot-jar-rem 


include $(BUILD_SYSTEM)/dex_preopt_libart.mk



# === hiddenapi rules ===

ifneq ($(UNSAFE_DISABLE_HIDDENAPI_FLAGS),true)



hiddenapi_stubs_jar = $(call intermediates-dir-for,JAVA_LIBRARIES,$(1),,COMMON)/javalib.jar



# Public API stubs

HIDDENAPI_STUBS := \

    $(call hiddenapi_stubs_jar,android_stubs_current) \

    $(call hiddenapi_stubs_jar,android.test.base.stubs)



# System API stubs

HIDDENAPI_STUBS_SYSTEM := \

    $(call hiddenapi_stubs_jar,android_system_stubs_current)



# Test API stubs

HIDDENAPI_STUBS_TEST := \

    $(call hiddenapi_stubs_jar,android_test_stubs_current)



# Core Platform API stubs

HIDDENAPI_STUBS_CORE_PLATFORM := \

    $(call hiddenapi_stubs_jar,core.platform.api.stubs)



# Allow products to define their own stubs for custom product jars that apps can use.

ifdef PRODUCT_HIDDENAPI_STUBS

  HIDDENAPI_STUBS += $(foreach stub,$(PRODUCT_HIDDENAPI_STUBS), $(call hiddenapi_stubs_jar,$(stub)))

endif



ifdef PRODUCT_HIDDENAPI_STUBS_SYSTEM

  HIDDENAPI_STUBS_SYSTEM += $(foreach stub,$(PRODUCT_HIDDENAPI_STUBS_SYSTEM), $(call hiddenapi_stubs_jar,$(stub)))

endif



ifdef PRODUCT_HIDDENAPI_STUBS_TEST

  HIDDENAPI_STUBS_TEST += $(foreach stub,$(PRODUCT_HIDDENAPI_STUBS_TEST), $(call hiddenapi_stubs_jar,$(stub)))

endif



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

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

.KATI_RESTAT: $(INTERNAL_PLATFORM_HIDDENAPI_STUB_FLAGS)

$(INTERNAL_PLATFORM_HIDDENAPI_STUB_FLAGS): $(SOONG_HIDDENAPI_DEX_INPUTS)

$(INTERNAL_PLATFORM_HIDDENAPI_STUB_FLAGS): PRIVATE_DEX_INPUTS := $(SOONG_HIDDENAPI_DEX_INPUTS)

$(INTERNAL_PLATFORM_HIDDENAPI_STUB_FLAGS): PRIVATE_HIDDENAPI_STUBS := $(HIDDENAPI_STUBS)

$(INTERNAL_PLATFORM_HIDDENAPI_STUB_FLAGS): PRIVATE_HIDDENAPI_STUBS_SYSTEM := $(HIDDENAPI_STUBS_SYSTEM)

$(INTERNAL_PLATFORM_HIDDENAPI_STUB_FLAGS): PRIVATE_HIDDENAPI_STUBS_TEST := $(HIDDENAPI_STUBS_TEST)

$(INTERNAL_PLATFORM_HIDDENAPI_STUB_FLAGS): PRIVATE_HIDDENAPI_STUBS_CORE_PLATFORM := $(HIDDENAPI_STUBS_CORE_PLATFORM)

$(INTERNAL_PLATFORM_HIDDENAPI_STUB_FLAGS): $(HIDDENAPI) $(HIDDENAPI_STUBS) \

                                           $(HIDDENAPI_STUBS_SYSTEM) $(HIDDENAPI_STUBS_TEST) \

                                           $(HIDDENAPI_STUBS_CORE_PLATFORM)

	$(HIDDENAPI) list $(addprefix --boot-dex=,$(PRIVATE_DEX_INPUTS)) \

	    --public-stub-classpath=$(call normalize-path-list, $(PRIVATE_HIDDENAPI_STUBS)) \

	    --public-stub-classpath=$(call normalize-path-list, $(PRIVATE_HIDDENAPI_STUBS_SYSTEM)) \

	    --public-stub-classpath=$(call normalize-path-list, $(PRIVATE_HIDDENAPI_STUBS_TEST)) \

	    --core-platform-stub-classpath=$(call normalize-path-list, $(PRIVATE_HIDDENAPI_STUBS_CORE_PLATFORM)) \

	    --out-api-flags=$(INTERNAL_PLATFORM_HIDDENAPI_STUB_FLAGS).tmp

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



# Inputs to singleton rules located in frameworks/base

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

$(INTERNAL_PLATFORM_HIDDENAPI_GREYLIST_METADATA): $(SOONG_HIDDENAPI_GREYLIST_METADATA)

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

endif  # UNSAFE_DISABLE_HIDDENAPI_FLAGS



ifeq ($(PRODUCT_DIST_BOOT_AND_SYSTEM_JARS),true)

boot_profile_jars_zip := $(PRODUCT_OUT)/boot_profile_jars.zip

all_boot_jars := \

core/java.mk

+5 −18
Original line number Diff line number Diff line
@@ -71,11 +71,8 @@ full_classes_processed_jar := $(intermediates.COMMON)/classes-processed.jar 
full_classes_jarjar_jar := $(intermediates.COMMON)/classes-jarjar.jar

full_classes_combined_jar := $(intermediates.COMMON)/classes-combined.jar

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

hiddenapi_flags_csv := $(intermediates.COMMON)/hiddenapi/flags.csv

hiddenapi_metadata_csv := $(intermediates.COMMON)/hiddenapi/greylist.csv



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.
@@ -500,21 +497,11 @@ else # !LOCAL_PROGUARD_ENABLED 
	$(transform-classes.jar-to-dex)

endif



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

  # Derive API greylist from the classes jar.

  # We use full_classes_pre_proguard_jar here, as that is what is converted to

  # 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-csv, $(full_classes_pre_proguard_jar),$(hiddenapi_flags_csv),$(hiddenapi_metadata_csv)))

  LOCAL_INTERMEDIATE_TARGETS += $(hiddenapi_flags_csv) $(hiddenapi_metadata_csv)

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

  built_dex_copy_from := $(built_dex_hiddenapi)

else # !is_boot_jar

  built_dex_copy_from := $(built_dex_intermediate)

endif # is_boot_jar



$(built_dex): $(built_dex_copy_from)

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

  $(call pretty-error,Modules in PRODUCT_BOOT_JARS must be defined in Android.bp files)

endif



$(built_dex): $(built_dex_intermediate)

	@echo Copying: $@

	$(hide) mkdir -p $(dir $@)

	$(hide) rm -f $(dir $@)/classes*.dex