diff options
Diffstat (limited to 'core/definitions.mk')
| -rw-r--r-- | core/definitions.mk | 49 |
1 files changed, 30 insertions, 19 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index a524b2f..97a909b 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -55,11 +55,6 @@ ALL_MODULE_TAGS:= # its sub-variables.) ALL_MODULE_NAME_TAGS:= -# All host modules are automatically installed (i.e. outside -# of the product configuration scheme). This is a list of the -# install targets (LOCAL_INSTALLED_MODULE). -ALL_HOST_INSTALLED_FILES:= - # Full paths to all prebuilt files that will be copied # (used to make the dependency on acp) ALL_PREBUILT:= @@ -801,7 +796,7 @@ rm -f $(@:$1=$(YACC_HEADER_SUFFIX)) endef ########################################################### -## Commands to compile RenderScript +## Commands to compile RenderScript to Java ########################################################### define transform-renderscripts-to-java-and-bc @@ -824,6 +819,26 @@ $(hide) mkdir -p $(dir $@) $(hide) touch $@ endef +########################################################### +## Commands to compile RenderScript to C++ +########################################################### + +define transform-renderscripts-to-cpp-and-bc +@echo "RenderScript: $(PRIVATE_MODULE) <= $(PRIVATE_RS_SOURCE_FILES)" +$(hide) rm -rf $(PRIVATE_RS_OUTPUT_DIR) +$(hide) mkdir -p $(PRIVATE_RS_OUTPUT_DIR)/ +$(hide) $(PRIVATE_RS_CC) \ + -o $(PRIVATE_RS_OUTPUT_DIR)/ \ + -d $(PRIVATE_RS_OUTPUT_DIR) \ + -a $@ -MD \ + -reflect-c++ \ + $(PRIVATE_RS_FLAGS) \ + $(foreach inc,$(PRIVATE_RS_INCLUDES),$(addprefix -I , $(inc))) \ + $(PRIVATE_RS_SOURCE_FILES) +$(hide) mkdir -p $(dir $@) +$(hide) touch $@ +endef + ########################################################### ## Commands for running aidl @@ -930,15 +945,13 @@ $(hide) $(PRIVATE_CC) \ $(PRIVATE_TARGET_GLOBAL_CFLAGS) \ $(PRIVATE_ARM_CFLAGS) \ ) \ - $(PRIVATE_CFLAGS) \ - $(1) \ - $(PRIVATE_DEBUG_CFLAGS) \ + $(1) \ -MD -MF $(patsubst %.o,%.d,$@) -o $@ $< endef define transform-c-to-o-no-deps @echo "target $(PRIVATE_ARM_MODE) C: $(PRIVATE_MODULE) <= $<" -$(call transform-c-or-s-to-o-no-deps, ) +$(call transform-c-or-s-to-o-no-deps, $(PRIVATE_CFLAGS) $(PRIVATE_CONLYFLAGS) $(PRIVATE_DEBUG_CFLAGS)) endef define transform-s-to-o-no-deps @@ -964,7 +977,7 @@ endef define transform-m-to-o-no-deps @echo "target ObjC: $(PRIVATE_MODULE) <= $<" -$(call transform-c-or-s-to-o-no-deps) +$(call transform-c-or-s-to-o-no-deps, $(PRIVATE_CFLAGS) $(PRIVATE_DEBUG_CFLAGS)) endef define transform-m-to-o @@ -1019,15 +1032,13 @@ $(hide) $(PRIVATE_CC) \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(HOST_GLOBAL_CFLAGS) \ ) \ - $(PRIVATE_CFLAGS) \ $(1) \ - $(PRIVATE_DEBUG_CFLAGS) \ -MD -MF $(patsubst %.o,%.d,$@) -o $@ $< endef define transform-host-c-to-o-no-deps @echo "host C: $(PRIVATE_MODULE) <= $<" -$(call transform-host-c-or-s-to-o-no-deps, ) +$(call transform-host-c-or-s-to-o-no-deps, $(PRIVATE_CFLAGS) $(PRIVATE_CONLYFLAGS) $(PRIVATE_DEBUG_CFLAGS)) endef define transform-host-s-to-o-no-deps @@ -1051,7 +1062,7 @@ endef define transform-host-m-to-o-no-deps @echo "host ObjC: $(PRIVATE_MODULE) <= $<" -$(call transform-host-c-or-s-to-o-no-deps) +$(call transform-host-c-or-s-to-o-no-deps, $(PRIVATE_CFLAGS) $(PRIVATE_DEBUG_CFLAGS)) endef define transform-host-m-to-o @@ -1465,11 +1476,11 @@ $(hide) tr ' ' '\n' < $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list \ $(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then \ $(1) -encoding UTF-8 \ $(strip $(PRIVATE_JAVAC_DEBUG_FLAGS)) \ - $(if $(findstring true,$(LOCAL_WARNINGS_ENABLE)),$(xlint_unchecked),) \ + $(if $(findstring true,$(PRIVATE_WARNINGS_ENABLE)),$(xlint_unchecked),) \ $(2) \ $(addprefix -classpath ,$(strip \ $(call normalize-path-list,$(PRIVATE_ALL_JAVA_LIBRARIES)))) \ - $(if $(findstring true,$(LOCAL_WARNINGS_ENABLE)),$(xlint_unchecked),) \ + $(if $(findstring true,$(PRIVATE_WARNINGS_ENABLE)),$(xlint_unchecked),) \ -extdirs "" -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) \ $(PRIVATE_JAVACFLAGS) \ \@$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq \ @@ -1513,11 +1524,11 @@ $(hide) tr ' ' '\n' < $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list \ $(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then \ $(1) -encoding UTF-8 \ $(strip $(PRIVATE_JAVAC_DEBUG_FLAGS)) \ - $(if $(findstring true,$(LOCAL_WARNINGS_ENABLE)),$(xlint_unchecked),) \ + $(if $(findstring true,$(PRIVATE_WARNINGS_ENABLE)),$(xlint_unchecked),) \ $(2) \ $(addprefix -classpath ,$(strip \ $(call normalize-path-list,$(PRIVATE_ALL_JAVA_LIBRARIES) $(PRIVATE_CLASS_INTERMEDIATES_DIR)))) \ - $(if $(findstring true,$(LOCAL_WARNINGS_ENABLE)),$(xlint_unchecked),) \ + $(if $(findstring true,$(PRIVATE_WARNINGS_ENABLE)),$(xlint_unchecked),) \ -extdirs "" -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) \ $(PRIVATE_JAVACFLAGS) \ \@$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq \ |