Explicitly include Android.mk for only OpenGL
Replace all-makefiles-under makefile-macro with explicitly including
Android.mk(s) from subdirectories that are related to OpenGL and are
only needed by Android builds.
The change are mainly made to the top-level Android.mk and the
src/Android.mk. The other three sub-Android.mk(s) are deprecated and
deleted. Soong compile-time is expected to shorten with no use of
all-makefiles-under macros.
Since the project co-existed with both Android.bp and Android.mk.
The test was performed in absence of Android.bp on oc-mr1-dev branch
against aosp_arm-eng and aosp_arm64-eng targets.
NOTE: Android Pie uses Android.bp only.
Bug: b/29023322
Test: oc-mr1-dev branch, aosp_arm-eng (LLVM3) & aosp_arm64-eng (LLVM7) targets
Change-Id: I05ac46213f849747621c7084bca2549a22513881
Reviewed-on: https://swiftshader-review.googlesource.com/21068
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Merck Hung <merckhung@google.com>
diff --git a/src/Android.mk b/src/Android.mk
index 3695926..b25ef91 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -1,4 +1,5 @@
-LOCAL_PATH:= $(call my-dir)
+LOCAL_PATH := $(call my-dir)
+swiftshader_src_root := $(LOCAL_PATH)
COMMON_C_INCLUDES += \
bionic \
@@ -186,4 +187,8 @@
LOCAL_STATIC_LIBRARIES := $(COMMON_STATIC_LIBRARIES)
include $(BUILD_STATIC_LIBRARY)
-include $(call all-makefiles-under,$(LOCAL_PATH))
+include $(swiftshader_src_root)/Reactor/Android.mk
+include $(swiftshader_src_root)/OpenGL/libGLESv2/Android.mk
+include $(swiftshader_src_root)/OpenGL/libGLES_CM/Android.mk
+include $(swiftshader_src_root)/OpenGL/libEGL/Android.mk
+include $(swiftshader_src_root)/OpenGL/compiler/Android.mk
