commit a2d2055e10c1f977ab19789242de67e92e350198
author Nicolas Capens <capn@google.com> Wed Nov 25 15:33:07 2015 -0500
committer Nicolas Capens <capn@google.com> Tue Dec 01 20:38:26 2015 +0000
tree 9006c666f980f84ece298a554c009d0a687acd34
parent 4fd96650a99cd1648db8356de9871941a46a6cdb

Build SwiftShader for sdk_google targets.

Change-Id: I9cff8a31cac858e14c2364a79f61c028996e91dd
Reviewed-on: https://swiftshader-review.googlesource.com/4304
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Keun Soo Yim <yim@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

Android.mk

diff --git a/Android.mk b/Android.mk
index 6efece6..85a6873 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,8 +14,12 @@
 # limitations under the License.
 #
 
-ifneq ($(filter gce_x86 gce calypso, $(TARGET_DEVICE)),)
 LOCAL_PATH:= $(call my-dir)
 
+ifndef SWIFTSHADER_OPTIM
+SWIFTSHADER_OPTIM := release
+endif
+
+ifneq ($(filter gce_x86 gce calypso, $(TARGET_DEVICE))$(filter sdk_google_%, $(TARGET_PRODUCT)),)
 include $(call all-makefiles-under,$(LOCAL_PATH))
 endif

src/Android.mk

diff --git a/src/Android.mk b/src/Android.mk
index 61a4e42..58bfe1a 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -106,6 +106,4 @@
 LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES)
 include $(BUILD_STATIC_LIBRARY)
 
-ifneq ($(filter gce_x86 gce calypso, $(TARGET_DEVICE)),)
 include $(call all-makefiles-under,$(LOCAL_PATH))
-endif

src/OpenGL/Android.mk

diff --git a/src/OpenGL/Android.mk b/src/OpenGL/Android.mk
index 6efece6..3daa3a0 100644
--- a/src/OpenGL/Android.mk
+++ b/src/OpenGL/Android.mk
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-ifneq ($(filter gce_x86 gce calypso, $(TARGET_DEVICE)),)
 LOCAL_PATH:= $(call my-dir)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
-endif