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/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)