StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Now slang supports "-I" options.

Browse Source 
Change-Id: I32aef6c913d9d30f9982a593397145f1562aecf9
This commit is contained in:
Ying Wang
2010-09-01 13:28:52 -07:00
parent fe648a9f58
commit 512802772a
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/clear_vars.mk
View File

@@ -93,11 +93,12 @@ LOCAL_SDK_VERSION:=
LOCAL_NDK_VERSION:= LOCAL_NDK_VERSION:=
LOCAL_NO_EMMA_INSTRUMENT:= LOCAL_NO_EMMA_INSTRUMENT:=
LOCAL_NO_EMMA_COMPILE:= LOCAL_NO_EMMA_COMPILE:=
LOCAL_PROGUARD_ENABLED:= # '',optonly,full,custom LOCAL_PROGUARD_ENABLED:= # '',optonly,full,custom,disabled
LOCAL_PROGUARD_FLAGS:= LOCAL_PROGUARD_FLAGS:=
LOCAL_EMMA_COVERAGE_FILTER:= LOCAL_EMMA_COVERAGE_FILTER:=
LOCAL_WARNINGS_ENABLE:= LOCAL_WARNINGS_ENABLE:=
LOCAL_MANIFEST_FILE:= LOCAL_MANIFEST_FILE:=
LOCAL_RENDERSCRIPT_INCLUDES:=
# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to # Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to
# iterate over thousands of entries every time. # iterate over thousands of entries every time.

1
core/definitions.mk
View File

@@ -758,6 +758,7 @@ $(hide) $(SLANG) \
--allow-rs-prefix \ --allow-rs-prefix \
-o $(PRIVATE_RS_OUTPUT_DIR)/res/raw \ -o $(PRIVATE_RS_OUTPUT_DIR)/res/raw \
-p $(PRIVATE_RS_OUTPUT_DIR)/src \ -p $(PRIVATE_RS_OUTPUT_DIR)/src \
$(foreach inc,$(PRIVATE_RS_INCLUDES),$(addprefix -I , $(inc))) \
$(PRIVATE_RS_SOURCE_FILES) $(PRIVATE_RS_SOURCE_FILES)
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)
$(hide) touch $@ $(hide) touch $@

5
core/java.mk
View File

@@ -105,6 +105,11 @@ ifneq ($(renderscript_sources),)
renderscript_sources_fullpath := $(addprefix $(LOCAL_PATH)/, $(renderscript_sources)) renderscript_sources_fullpath := $(addprefix $(LOCAL_PATH)/, $(renderscript_sources))
RenderScript_file_stamp := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/RenderScript.stamp RenderScript_file_stamp := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/RenderScript.stamp
# prepend the RenderScript system include path
LOCAL_RENDERSCRIPT_INCLUDES := $(TOPDIR)frameworks/base/libs/rs/scriptc \
$(LOCAL_RENDERSCRIPT_INCLUDES)
$(RenderScript_file_stamp): PRIVATE_RS_INCLUDES := $(LOCAL_RENDERSCRIPT_INCLUDES)
$(RenderScript_file_stamp): PRIVATE_RS_SOURCE_FILES := $(renderscript_sources_fullpath) $(RenderScript_file_stamp): PRIVATE_RS_SOURCE_FILES := $(renderscript_sources_fullpath)
# By putting the generated java files into $(LOCAL_INTERMEDIATE_SOURCE_DIR), they will be # By putting the generated java files into $(LOCAL_INTERMEDIATE_SOURCE_DIR), they will be
# automatically found by the java compiling function transform-java-to-classes.jar. # automatically found by the java compiling function transform-java-to-classes.jar.