commit 21028b7ad6a52738ff39b14d4588695dc95df1f0
author Adrian Roos <roosa@google.com> Tue Jan 15 18:30:51 2019 +0100
committer Adrian Roos <roosa@google.com> Fri Jan 25 17:35:25 2019 +0100
tree ee758aacb7c7b32972eea91fdf1a21f86e1efdc2
parent 673cbcd6f8d259a09940cbcf89a51ccc9f30b845

Remove dependencies on hiddenapi files with UNSAFE_DISABLE_HIDDENAPI_FLAGS=true

Fixes: 122957987
Test: UNSAFE_DISABLE_HIDDENAPI_FLAGS=true make droid
Change-Id: Iafef8cc69971fd10718882326fbba99a6223d0f8

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 2cf2bf1..362a345 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2694,6 +2694,7 @@
 
 # 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 @@
     PRIVATE_METADATA_INPUTS := $$(PRIVATE_METADATA_INPUTS) $(3)
 
 endif
+endif  # UNSAFE_DISABLE_HIDDENAPI_FLAGS
 endef
 
 

core/dex_preopt.mk

diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk
index 60fd8db..c1d4e8a 100644
--- a/core/dex_preopt.mk
+++ b/core/dex_preopt.mk
@@ -31,6 +31,7 @@
 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 @@
 # 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

diff --git a/core/package_internal.mk b/core/package_internal.mk
index 9ddbd1b..06dc1b7 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -576,9 +576,11 @@
 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

diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk
index 0b48a77..cd48025 100644
--- a/core/prebuilt_internal.mk
+++ b/core/prebuilt_internal.mk
@@ -74,9 +74,11 @@
 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

diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk
index a6315b4..b67381e 100644
--- a/core/soong_app_prebuilt.mk
+++ b/core/soong_app_prebuilt.mk
@@ -46,9 +46,11 @@
 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)