Define a host version of com.android.runtime
I'm fixing PHONY_PACKAGEs to be target/host specific, so the dependency
on APEX_TEXT_MODULE needs to come from a phony package with
LOCAL_IS_HOST_MODULE set.
Test: treehugger
Test: verify that art-check-debug-apex-gen-fakebin is installed
Change-Id: I2d3a89e63ead65ffc88a45e3660074552e17643b
diff --git a/Android.mk b/Android.mk
index 0866cc7..bebe759 100644
--- a/Android.mk
+++ b/Android.mk
@@ -361,9 +361,6 @@
LOCAL_MODULE := com.android.runtime
LOCAL_REQUIRED_MODULES := $(TARGET_RUNTIME_APEX)
-ifneq ($(HOST_OS),darwin)
- LOCAL_REQUIRED_MODULES += $(APEX_TEST_MODULE)
-endif
LOCAL_REQUIRED_MODULES += art_apex_boot_integrity
# Clear locally used variable.
@@ -371,6 +368,14 @@
include $(BUILD_PHONY_PACKAGE)
+include $(CLEAR_VARS)
+LOCAL_MODULE := com.android.runtime
+LOCAL_IS_HOST_MODULE := true
+ifneq ($(HOST_OS),darwin)
+ LOCAL_REQUIRED_MODULES += $(APEX_TEST_MODULE)
+endif
+include $(BUILD_PHONY_PACKAGE)
+
# Create canonical name -> file name symlink in the symbol directory
# The symbol files for the debug or release variant are installed to
# $(TARGET_OUT_UNSTRIPPED)/$(TARGET_RUNTIME_APEX) directory. However,