From 4c226593625b48b7338e6b090f5285f0eca716fc Mon Sep 17 00:00:00 2001
From: Igor Murashkin <iam@google.com>
Date: Wed, 28 Sep 2016 09:04:07 -0700
Subject: [PATCH] build: Fix golem build to exclude libartd.so from
 public.libraries.txt

Golem doesn't build libartd.so, so at runtime the JNI loading would fail
when trying to initialize the android library namespaces.

Test: build-art-target-golem
Bug: 31401609
Change-Id: I2ee988e84d0a87b3cd1338d29fc28a874905cccc
---
 Android.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Android.mk b/Android.mk
index 8b6f21ec4..0567b221a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -445,6 +445,8 @@ build-art-target-golem: dex2oat dalvikvm patchoat linker \
                         $(ART_TARGET_SHARED_LIBRARY_BENCHMARK) \
                         $(TARGET_CORE_IMG_OUT_BASE).art \
                         $(TARGET_CORE_IMG_OUT_BASE)-interpreter.art
+	sed -i '/libartd.so/d' $(TARGET_OUT)/etc/public.libraries.txt
+	# remove libartd.so from public.libraries.txt because golem builds won't have it.
 
 ########################################################################
 # Phony target for building what go/lem requires on host.
-- 
2.11.0