Ensure that make reaches deep enough in the tree.

Android.mk

+#
+# Copyright 2015 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# 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

src/Android.mk

@@ -101,3 +101,7 @@ LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
 LOCAL_CFLAGS := $(COMMON_CFLAGS) -UNDEBUG -g -O0 -DDEFAULT_THREAD_COUNT=1
 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

+#
+# Copyright 2015 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# 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

src/OpenGL/libEGL/Android.mk

@@ -39,14 +39,12 @@ COMMON_LDFLAGS := \
 	-Wl,--hash-style=sysv
 
 include $(CLEAR_VARS)
-
 LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/obj
 LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/sym
 LOCAL_MODULE := libEGL_swiftshader_vendor_debug
 LOCAL_MODULE_TAGS := optional
 LOCAL_INSTALLED_MODULE_STEM := libEGL_swiftshader.so
 LOCAL_CFLAGS += $(COMMON_CFLAGS) -UNDEBUG -g -O0
-
 LOCAL_CLANG := true
 LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
 LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
@@ -56,14 +54,12 @@ LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
-
 LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/obj
 LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/sym
 LOCAL_MODULE := libEGL_swiftshader_vendor_release
 LOCAL_MODULE_TAGS := optional
 LOCAL_INSTALLED_MODULE_STEM := libEGL_swiftshader.so
 LOCAL_CFLAGS += $(COMMON_CFLAGS) -DANGLE_DISABLE_TRACE
-
 LOCAL_CLANG := true
 LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
 LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
@@ -71,3 +67,20 @@ LOCAL_STATIC_LIBRARIES += swiftshader_top_release $(COMMON_STATIC_LIBRARIES)
 LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
 LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
 include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
+LOCAL_MODULE := libEGL_swiftshader
+LOCAL_MODULE_TAGS := optional
+LOCAL_CLANG := true
+LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
+LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
+LOCAL_STATIC_LIBRARIES += swiftshader_top_$(SWIFTSHADER_OPTIM) $(COMMON_STATIC_LIBRARIES)
+LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
+LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
+ifeq (debug,$(SWIFTSHADER_OPTIM))
+LOCAL_CFLAGS += $(COMMON_CFLAGS) -UNDEBUG -g -O0
+else
+LOCAL_CFLAGS += $(COMMON_CFLAGS) -DANGLE_DISABLE_TRACE
+endif
+include $(BUILD_SHARED_LIBRARY)

src/OpenGL/libGLES_CM/Android.mk

@@ -62,14 +62,12 @@ COMMON_LDFLAGS := \
 	-Wl,--hash-style=sysv
 
 include $(CLEAR_VARS)
-
+LOCAL_MODULE := libGLESv1_CM_swiftshader_vendor_debug
 LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/obj
 LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/sym
-LOCAL_MODULE := libGLESv1_CM_swiftshader_vendor_debug
 LOCAL_MODULE_TAGS := optional
 LOCAL_INSTALLED_MODULE_STEM := libGLESv1_CM_swiftshader.so
 LOCAL_CFLAGS += $(COMMON_CFLAGS) -UNDEBUG -g -O0
-
 LOCAL_CLANG := true
 LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
 LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
@@ -78,11 +76,11 @@ LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
 LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
 include $(BUILD_SHARED_LIBRARY)
 
-include $(CLEAR_VARS)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := libGLESv1_CM_swiftshader_vendor_release
 LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/obj
 LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/sym
-LOCAL_MODULE := libGLESv1_CM_swiftshader_vendor_release
 LOCAL_MODULE_TAGS := optional
 LOCAL_INSTALLED_MODULE_STEM := libGLESv1_CM_swiftshader.so
 LOCAL_CFLAGS += \
@@ -91,7 +89,6 @@ LOCAL_CFLAGS += \
 	-ffunction-sections \
 	-fdata-sections \
 	-DANGLE_DISABLE_TRACE
-
 LOCAL_CLANG := true
 LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
 LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
@@ -99,3 +96,25 @@ LOCAL_STATIC_LIBRARIES += swiftshader_top_release $(COMMON_STATIC_LIBRARIES)
 LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
 LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
 include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libGLESv1_CM_swiftshader
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
+LOCAL_MODULE_TAGS := optional
+LOCAL_CLANG := true
+LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
+LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
+LOCAL_STATIC_LIBRARIES += swiftshader_top_$(SWIFTSHADER_OPTIM) $(COMMON_STATIC_LIBRARIES)
+LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
+LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
+ifeq (debug,$(SWIFTSHADER_OPTIM))
+LOCAL_CFLAGS += $(COMMON_CFLAGS) -UNDEBUG -g -O0
+else
+LOCAL_CFLAGS += \
+	$(COMMON_CFLAGS) \
+	-fomit-frame-pointer \
+	-ffunction-sections \
+	-fdata-sections \
+	-DANGLE_DISABLE_TRACE
+endif
+include $(BUILD_SHARED_LIBRARY)

src/OpenGL/libGLESv2/Android.mk

@@ -67,14 +67,12 @@ COMMON_LDFLAGS := \
 	-Wl,--hash-style=sysv
 
 include $(CLEAR_VARS)
-
+LOCAL_MODULE := libGLESv2_swiftshader_vendor_debug
 LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/obj
 LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/debug/sym
-LOCAL_MODULE := libGLESv2_swiftshader_vendor_debug
 LOCAL_MODULE_TAGS := optional
 LOCAL_INSTALLED_MODULE_STEM := libGLESv2_swiftshader.so
 LOCAL_CFLAGS += $(COMMON_CFLAGS) -UNDEBUG -g -O0
-
 LOCAL_CLANG := true
 LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
 LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
@@ -84,10 +82,9 @@ LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
-
+LOCAL_MODULE := libGLESv2_swiftshader_vendor_release
 LOCAL_MODULE_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/obj
 LOCAL_UNSTRIPPED_PATH := vendor/transgaming/swiftshader/$(TARGET_ARCH)/release/sym
-LOCAL_MODULE := libGLESv2_swiftshader_vendor_release
 LOCAL_MODULE_TAGS := optional
 LOCAL_INSTALLED_MODULE_STEM := libGLESv2_swiftshader.so
 LOCAL_CFLAGS += \
@@ -96,7 +93,6 @@ LOCAL_CFLAGS += \
 	-ffunction-sections \
 	-fdata-sections \
 	-DANGLE_DISABLE_TRACE
-
 LOCAL_CLANG := true
 LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
 LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
@@ -104,3 +100,25 @@ LOCAL_STATIC_LIBRARIES += swiftshader_compiler_release swiftshader_top_release $
 LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
 LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
 include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libGLESv2_swiftshader
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
+LOCAL_MODULE_TAGS := optional
+LOCAL_CLANG := true
+LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
+LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
+LOCAL_STATIC_LIBRARIES += swiftshader_compiler_$(SWIFTSHADER_OPTIM) swiftshader_top_$(SWIFTSHADER_OPTIM) $(COMMON_STATIC_LIBRARIES)
+LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
+LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
+ifeq (debug,$(SWIFTSHADER_OPTIM))
+LOCAL_CFLAGS += $(COMMON_CFLAGS) -UNDEBUG -g -O0
+else
+LOCAL_CFLAGS += \
+	$(COMMON_CFLAGS) \
+	-fomit-frame-pointer \
+	-ffunction-sections \
+	-fdata-sections \
+	-DANGLE_DISABLE_TRACE
+endif
+include $(BUILD_SHARED_LIBRARY)