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

Commit 61ae763e authored Jan 31, 2019 by Treehugger Robot Committed by Gerrit Code Review Jan 31, 2019

Merge "Remove dependencies on hiddenapi files with UNSAFE_DISABLE_HIDDENAPI_FLAGS=true"

parents 5cc92309 21028b7a

core/definitions.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -2694,6 +2694,7 @@ 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)
		@@ -2712,6 +2713,7 @@ $(INTERNAL_PLATFORM_HIDDENAPI_GREYLIST_METADATA): \
		PRIVATE_METADATA_INPUTS := $$(PRIVATE_METADATA_INPUTS) $(3)

		endif
		endif # UNSAFE_DISABLE_HIDDENAPI_FLAGS
		endef

core/dex_preopt.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ $(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

		@@ -88,6 +89,7 @@ $(INTERNAL_PLATFORM_HIDDENAPI_STUB_FLAGS): $(HIDDENAPI) $(HIDDENAPI_STUBS) \
		# 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

core/package_internal.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -576,9 +576,11 @@ endif
		module_run_appcompat :=
		ifeq (true,$(non_system_module))
		ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) # ! unbundled app build
		ifneq ($(UNSAFE_DISABLE_HIDDENAPI_FLAGS),true)
		module_run_appcompat := true
		endif
		endif
		endif

		ifeq ($(module_run_appcompat),true)
		$(LOCAL_BUILT_MODULE) : $(appcompat-files)

core/prebuilt_internal.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -74,9 +74,11 @@ endif
		module_run_appcompat :=
		ifeq (true,$(non_system_module))
		ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) # ! unbundled app build
		ifneq ($(UNSAFE_DISABLE_HIDDENAPI_FLAGS),true)
		module_run_appcompat := true
		endif
		endif
		endif

		ifdef LOCAL_COMPRESSED_MODULE
		ifneq (true,$(LOCAL_COMPRESSED_MODULE))

core/soong_app_prebuilt.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -48,9 +48,11 @@ endif
		module_run_appcompat :=
		ifeq (true,$(non_system_module))
		ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) # ! unbundled app build
		ifneq ($(UNSAFE_DISABLE_HIDDENAPI_FLAGS),true)
		module_run_appcompat := true
		endif
		endif
		endif

		ifeq ($(module_run_appcompat),true)
		$(LOCAL_BUILT_MODULE): $(appcompat-files)