commit c6a7c1cb52a5c421fd1aa9d5fefd64e619896db6
author Ying Wang <wangying@google.com> Tue May 20 15:53:43 2014 -0700
committer Ying Wang <wangying@google.com> Tue May 20 17:56:42 2014 -0700
tree d6012f727af5500ff6e0ec30ca4b5ba7586cf4e3
parent 581eeb5d5ad71e2b8129abbef2f757a1a5b25b82

Fix host multilib build.

Bug: 13751317
Change-Id: Ia5da0f1468296aa749c4cce161001b6c18a55e04

Android.mk

diff --git a/Android.mk b/Android.mk
index dc6a2e8..7ec8109 100644
--- a/Android.mk
+++ b/Android.mk
@@ -177,8 +177,10 @@
 include $(CLEAR_VARS)
 LOCAL_MODULE:= libRS
 LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_IS_HOST_MODULE := true
 
-intermediates := $(call intermediates-dir-for,STATIC_LIBRARIES,libRS,HOST,)
+intermediates := $(call local-generated-sources-dir)
 
 # Generate custom headers