diff options
| -rw-r--r-- | Android.mk | 7 | ||||
| -rw-r--r-- | cpu_ref/Android.mk | 9 | ||||
| -rw-r--r-- | rsov/Android.mk | 4 |
3 files changed, 17 insertions, 3 deletions
@@ -22,6 +22,10 @@ rs-prebuilts-full: \ host_cross_bcc_compat endif +# Not building RenderScript modules in PDK builds, as libmediandk +# is not available in PDK. +ifneq ($(TARGET_BUILD_PDK), true) + rs_base_CFLAGS := -Werror -Wall -Wextra \ -Wno-unused-parameter -Wno-unused-variable @@ -240,4 +244,7 @@ LOCAL_LDFLAGS += -Wl,--version-script,${LOCAL_PATH}/libRS.map include $(BUILD_SHARED_LIBRARY) +endif # TARGET_BUILD_PDK + include $(call all-makefiles-under,$(LOCAL_PATH)) + diff --git a/cpu_ref/Android.mk b/cpu_ref/Android.mk index d50a77ed..9b3e9d3b 100644 --- a/cpu_ref/Android.mk +++ b/cpu_ref/Android.mk @@ -1,11 +1,12 @@ LOCAL_PATH:=$(call my-dir) +# Not building RenderScript modules in PDK builds, as libmediandk +# is not available in PDK. +ifneq ($(TARGET_BUILD_PDK), true) + rs_base_CFLAGS := -Werror -Wall -Wextra \ -Wno-unused-parameter -Wno-unused-variable \ -std=c++11 -ifeq ($(TARGET_BUILD_PDK), true) - rs_base_CFLAGS += -D__RS_PDK__ -endif ifneq ($(OVERRIDE_RS_DRIVER),) rs_base_CFLAGS += -DOVERRIDE_RS_DRIVER=$(OVERRIDE_RS_DRIVER) @@ -98,3 +99,5 @@ include frameworks/compile/libbcc/libbcc-targets.mk LOCAL_CFLAGS += $(rs_base_CFLAGS) include $(BUILD_SHARED_LIBRARY) + +endif # TARGET_BUILD_PDK diff --git a/rsov/Android.mk b/rsov/Android.mk index 2991304a..4afbb7c3 100644 --- a/rsov/Android.mk +++ b/rsov/Android.mk @@ -2,7 +2,11 @@ # Include Subdirectories #===================================================================== +# Not building RSoV modules in PDK builds, as libSPIRV is not available in PDK. +ifneq ($(TARGET_BUILD_PDK), true) + LOCAL_PATH:=$(call my-dir) include $(call all-makefiles-under,$(LOCAL_PATH)) +endif # TARGET_BUILD_PDK |