Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8af858e9 authored by Jason Sams's avatar Jason Sams
Browse files

Unbreak build by making the build of renderscript again conditional on... 

Unbreak build by making the build of renderscript again conditional on BUILD_RENDERSCRIPT until we can figure out why the build servers see an error that does not reproduce locally.
parent e29d471e

graphics/jni/Android.mk

+4 −1
Original line number Diff line number Diff line 
ifeq ($(BUILD_RENDERSCRIPT),true)



LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)
@@ -27,10 +29,11 @@ LOCAL_C_INCLUDES += \ 
LOCAL_CFLAGS +=



LOCAL_LDLIBS := -lpthread



LOCAL_ADDITIONAL_DEPENDENCIES := $(addprefix $(rs_generated_include_dir)/,rsgApiFuncDecl.h)

LOCAL_MODULE:= librs_jni

LOCAL_ADDITIONAL_DEPENDENCIES += $(rs_generated_source)

LOCAL_MODULE_TAGS := optional



include $(BUILD_SHARED_LIBRARY)



endif

libs/rs/Android.mk

+2 −3
Original line number Diff line number Diff line 
ifeq ($(BUILD_RENDERSCRIPT),true)



LOCAL_PATH:=$(call my-dir)
@@ -103,13 +105,10 @@ LOCAL_SRC_FILES:= \ 
LOCAL_SHARED_LIBRARIES += libcutils libutils libEGL libGLESv1_CM libui libacc

LOCAL_LDLIBS := -lpthread -ldl

LOCAL_MODULE:= libRS



LOCAL_MODULE_TAGS := optional



include $(BUILD_SHARED_LIBRARY)



ifeq ($(BUILD_RENDERSCRIPT),true)



# Include the subdirectories ====================

include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk,\

            java \