Split renderscript java code from test apps. Update makefiles.
diff --git a/Android.mk b/Android.mk
index 6ff39a4..00aaadd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,11 +1,11 @@
# Only build if BUILD_RENDERSCRIPT is defined to true in the environment.
ifeq ($(BUILD_RENDERSCRIPT),true)
-TOP_LOCAL_PATH:=$(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_PATH:= $(TOP_LOCAL_PATH)
+LOCAL_PATH:=$(call my-dir)
-# Build rsg-generator
+
+# Build rsg-generator ====================
+include $(CLEAR_VARS)
LOCAL_MODULE := rsg-generator
@@ -14,7 +14,7 @@
LOCAL_IS_HOST_MODULE := true
LOCAL_MODULE_CLASS := EXECUTABLES
-intermediates:= $(local-intermediates-dir)
+intermediates := $(local-intermediates-dir)
GEN := $(addprefix $(intermediates)/, \
lex.yy.c \
@@ -28,21 +28,21 @@
LOCAL_SRC_FILES:= \
rsg_generator.c
-
+
include $(BUILD_HOST_EXECUTABLE)
+# TODO: This should go into build/core/config.mk
RSG_GENERATOR:=$(LOCAL_BUILT_MODULE)
-# Build render script lib
+
+# Build render script lib ====================
include $(CLEAR_VARS)
LOCAL_MODULE := libRS
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
intermediates:= $(local-intermediates-dir)
-RS_GENERATED_INCLUDE_DIR:=$(intermediates)
-
# Generate custom headers
GEN := $(addprefix $(intermediates)/, \
@@ -50,12 +50,13 @@
rsgApiFuncDecl.h \
)
-$(GEN) : PRIVATE_CUSTOM_TOOL = $(RSG_GENERATOR) $< $@ <$(TOP_LOCAL_PATH)/rs.spec
+$(GEN) : PRIVATE_CUSTOM_TOOL = $(RSG_GENERATOR) $< $@ <$(LOCAL_PATH)/rs.spec
$(GEN) : $(RSG_GENERATOR) $(LOCAL_PATH)/rs.spec
$(GEN): $(intermediates)/%.h : $(LOCAL_PATH)/%.h.rsg
$(transform-generated-source)
-RS_GENERATED_SOURCES += $(GEN)
+# used in jni/Android.mk
+rs_generated_source += $(GEN)
LOCAL_GENERATED_SOURCES += $(GEN)
# Generate custom source files
@@ -65,12 +66,13 @@
rsgApiReplay.cpp \
)
-$(GEN) : PRIVATE_CUSTOM_TOOL = $(RSG_GENERATOR) $< $@ <$(TOP_LOCAL_PATH)/rs.spec
+$(GEN) : PRIVATE_CUSTOM_TOOL = $(RSG_GENERATOR) $< $@ <$(LOCAL_PATH)/rs.spec
$(GEN) : $(RSG_GENERATOR) $(LOCAL_PATH)/rs.spec
$(GEN): $(intermediates)/%.cpp : $(LOCAL_PATH)/%.cpp.rsg
$(transform-generated-source)
-RS_GENERATED_SOURCES += $(GEN)
+# used in jni/Android.mk
+rs_generated_source += $(GEN)
LOCAL_GENERATED_SOURCES += $(GEN)
LOCAL_SRC_FILES:= \
@@ -99,45 +101,15 @@
LOCAL_MODULE:= libRS
LOCAL_PRELINK_MODULE := false
-#LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
-# Build JNI library
-LOCAL_PATH:= $(TOP_LOCAL_PATH)/jni
-include $(CLEAR_VARS)
+# Include the subdirectories ====================
+include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk,\
+ jni \
+ java \
+ ))
-LOCAL_SRC_FILES:= \
- RenderScript_jni.cpp
-
-LOCAL_SHARED_LIBRARIES := \
- libandroid_runtime \
- libacc \
- libnativehelper \
- libRS \
- libcutils \
- libsgl \
- libutils \
- libui
-
-LOCAL_STATIC_LIBRARIES :=
-
-LOCAL_C_INCLUDES += \
- $(JNI_H_INCLUDE) \
- $(RS_GENERATED_INCLUDE_DIR) \
- $(call include-path-for, corecg graphics)
-
-LOCAL_CFLAGS +=
-
-LOCAL_LDLIBS := -lpthread
-
-LOCAL_MODULE:= libRS_jni
-LOCAL_PRELINK_MODULE := false
-
-LOCAL_ADDITIONAL_DEPENDENCIES += $(RS_GENERATED_SOURCES)
-
-include $(BUILD_SHARED_LIBRARY)
-
-include $(call all-subdir-makefiles)
endif # BUILD_RENDERSCRIPT