From 53ccc721794620537a879345ec65879e63dec2c9 Mon Sep 17 00:00:00 2001
From: Roland Levillain <rpl@google.com>
Date: Mon, 12 Nov 2018 18:33:39 +0000
Subject: [PATCH] Revert^2 "Add the Android Runtime APEX module to
 PRODUCT_PACKAGES."

Unless specified otherwise (using `DONT_INCLUDE_RUNTIME_APEX`).

This reverts commit 4c39bd2c6ee58d951224406fc94da30b1dde257f.

Test: make systemimage on taimen-userdebug
Test: make systemimage on marlin-eng
Test: make systemimage on marlin-userdebug
Test: make systemimage on sailfish-userdebug
Bug: 113373927
Change-Id: I1f1f0ffcc7bb6bf26d4df72613a806d2d73c5e82
---
 target/product/runtime_libart.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index bda45244d0..6d835fd42d 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -51,6 +51,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += art-runtime
 # ART/dex helpers.
 PRODUCT_PACKAGES += art-tools
+# Android Runtime APEX module.
+ifneq ($(DONT_INCLUDE_RUNTIME_APEX), true)
+  PRODUCT_PACKAGES += com.android.runtime
+endif
 
 # Certificates.
 PRODUCT_PACKAGES += \